|
|
@@ -1,4 +1,4 @@
|
|
|
-// dear imgui, v1.90.9
|
|
|
+// dear imgui, v1.91.0 WIP
|
|
|
// (main code and documentation)
|
|
|
|
|
|
// Help:
|
|
|
@@ -438,6 +438,12 @@ CODE
|
|
|
- likewise io.MousePos and GetMousePos() will use OS coordinates.
|
|
|
If you query mouse positions to interact with non-imgui coordinates you will need to offset them, e.g. subtract GetWindowViewport()->Pos.
|
|
|
|
|
|
+ - 2024/07/02 (1.91.0) - commented out obsolete ImGuiModFlags (renamed to ImGuiKeyChord in 1.89). (#4921, #456)
|
|
|
+ - commented out obsolete ImGuiModFlags_XXX values (renamed to ImGuiMod_XXX in 1.89). (#4921, #456)
|
|
|
+ - ImGuiModFlags_Ctrl -> ImGuiMod_Ctrl, ImGuiModFlags_Shift -> ImGuiMod_Shift etc.
|
|
|
+ - 2024/07/02 (1.91.0) - IO, IME: renamed platform IME hook and added explicit context for consistency and future-proofness.
|
|
|
+ - old: io.SetPlatformImeDataFn(ImGuiViewport* viewport, ImGuiPlatformImeData* data);
|
|
|
+ - new: io.PlatformSetImeDataFn(ImGuiContext* ctx, ImGuiViewport* viewport, ImGuiPlatformImeData* data);
|
|
|
- 2024/06/21 (1.90.9) - BeginChild: added ImGuiChildFlags_NavFlattened as a replacement for the window flag ImGuiWindowFlags_NavFlattened: the feature only ever made sense for BeginChild() anyhow.
|
|
|
- old: BeginChild("Name", size, 0, ImGuiWindowFlags_NavFlattened);
|
|
|
- new: BeginChild("Name", size, ImGuiChildFlags_NavFlattened, 0);
|
|
|
@@ -1026,7 +1032,7 @@ CODE
|
|
|
#endif
|
|
|
|
|
|
// [Windows] OS specific includes (optional)
|
|
|
-#if defined(_WIN32) && defined(IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS) && defined(IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCTIONS) && defined(IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS) && !defined(IMGUI_DISABLE_WIN32_FUNCTIONS)
|
|
|
+#if defined(_WIN32) && defined(IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS) && defined(IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCTIONS) && defined(IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS) && defined(IMGUI_DISABLE_DEFAULT_SHELL_FUNCTIONS) && !defined(IMGUI_DISABLE_WIN32_FUNCTIONS)
|
|
|
#define IMGUI_DISABLE_WIN32_FUNCTIONS
|
|
|
#endif
|
|
|
#if defined(_WIN32) && !defined(IMGUI_DISABLE_WIN32_FUNCTIONS)
|
|
|
@@ -1045,6 +1051,7 @@ CODE
|
|
|
// The UWP and GDK Win32 API subsets don't support clipboard nor IME functions
|
|
|
#define IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCTIONS
|
|
|
#define IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS
|
|
|
+#define IMGUI_DISABLE_DEFAULT_SHELL_FUNCTIONS
|
|
|
#endif
|
|
|
#endif
|
|
|
|
|
|
@@ -1137,7 +1144,8 @@ static void WindowSettingsHandler_WriteAll(ImGuiContext*, ImGuiSetti
|
|
|
// Platform Dependents default implementation for IO functions
|
|
|
static const char* GetClipboardTextFn_DefaultImpl(void* user_data_ctx);
|
|
|
static void SetClipboardTextFn_DefaultImpl(void* user_data_ctx, const char* text);
|
|
|
-static void SetPlatformImeDataFn_DefaultImpl(ImGuiViewport* viewport, ImGuiPlatformImeData* data);
|
|
|
+static void PlatformSetImeDataFn_DefaultImpl(ImGuiContext* ctx, ImGuiViewport* viewport, ImGuiPlatformImeData* data);
|
|
|
+static void PlatformOpenInShellFn_DefaultImpl(ImGuiContext* ctx, const char* path);
|
|
|
|
|
|
namespace ImGui
|
|
|
{
|
|
|
@@ -1409,6 +1417,7 @@ ImGuiIO::ImGuiIO()
|
|
|
// Note: Initialize() will setup default clipboard/ime handlers.
|
|
|
BackendPlatformName = BackendRendererName = NULL;
|
|
|
BackendPlatformUserData = BackendRendererUserData = BackendLanguageUserData = NULL;
|
|
|
+ PlatformOpenInShellUserData = NULL;
|
|
|
PlatformLocaleDecimalPoint = '.';
|
|
|
|
|
|
// Input (NB: we already have memset zero the entire structure!)
|
|
|
@@ -3420,6 +3429,7 @@ const char* ImGui::GetStyleColorName(ImGuiCol idx)
|
|
|
case ImGuiCol_TableBorderLight: return "TableBorderLight";
|
|
|
case ImGuiCol_TableRowBg: return "TableRowBg";
|
|
|
case ImGuiCol_TableRowBgAlt: return "TableRowBgAlt";
|
|
|
+ case ImGuiCol_TextLink: return "TextLink";
|
|
|
case ImGuiCol_TextSelectedBg: return "TextSelectedBg";
|
|
|
case ImGuiCol_DragDropTarget: return "DragDropTarget";
|
|
|
case ImGuiCol_NavHighlight: return "NavHighlight";
|
|
|
@@ -3565,7 +3575,7 @@ void ImGui::RenderTextEllipsis(ImDrawList* draw_list, const ImVec2& pos_min, con
|
|
|
|
|
|
const ImFont* font = draw_list->_Data->Font;
|
|
|
const float font_size = draw_list->_Data->FontSize;
|
|
|
- const float font_scale = font_size / font->FontSize;
|
|
|
+ const float font_scale = draw_list->_Data->FontScale;
|
|
|
const char* text_end_ellipsis = NULL;
|
|
|
const float ellipsis_width = font->EllipsisWidth * font_scale;
|
|
|
|
|
|
@@ -3742,7 +3752,7 @@ void ImGui::DestroyContext(ImGuiContext* ctx)
|
|
|
IM_DELETE(ctx);
|
|
|
}
|
|
|
|
|
|
-// IMPORTANT: ###xxx suffixes must be same in ALL languages
|
|
|
+// IMPORTANT: ###xxx suffixes must be same in ALL languages to allow for automation.
|
|
|
static const ImGuiLocEntry GLocalizationEntriesEnUS[] =
|
|
|
{
|
|
|
{ ImGuiLocKey_VersionStr, "Dear ImGui " IMGUI_VERSION " (" IM_STRINGIFY(IMGUI_VERSION_NUM) ")" },
|
|
|
@@ -3753,6 +3763,7 @@ static const ImGuiLocEntry GLocalizationEntriesEnUS[] =
|
|
|
{ ImGuiLocKey_WindowingMainMenuBar, "(Main menu bar)" },
|
|
|
{ ImGuiLocKey_WindowingPopup, "(Popup)" },
|
|
|
{ ImGuiLocKey_WindowingUntitled, "(Untitled)" },
|
|
|
+ { ImGuiLocKey_CopyLink, "Copy Link###CopyLink" },
|
|
|
{ ImGuiLocKey_DockingHideTabBar, "Hide tab bar###HideTabBar" },
|
|
|
{ ImGuiLocKey_DockingHoldShiftToDock, "Hold SHIFT to enable Docking window." },
|
|
|
{ ImGuiLocKey_DockingDragToUndockOrMoveNode,"Click and drag to move or undock whole node." },
|
|
|
@@ -3784,7 +3795,8 @@ void ImGui::Initialize()
|
|
|
g.IO.GetClipboardTextFn = GetClipboardTextFn_DefaultImpl; // Platform dependent default implementations
|
|
|
g.IO.SetClipboardTextFn = SetClipboardTextFn_DefaultImpl;
|
|
|
g.IO.ClipboardUserData = (void*)&g; // Default implementation use the ImGuiContext as user data (ideally those would be arguments to the function)
|
|
|
- g.IO.SetPlatformImeDataFn = SetPlatformImeDataFn_DefaultImpl;
|
|
|
+ g.IO.PlatformOpenInShellFn = PlatformOpenInShellFn_DefaultImpl;
|
|
|
+ g.IO.PlatformSetImeDataFn = PlatformSetImeDataFn_DefaultImpl;
|
|
|
|
|
|
// Create default viewport
|
|
|
ImGuiViewportP* viewport = IM_NEW(ImGuiViewportP)();
|
|
|
@@ -3984,6 +3996,7 @@ static void SetCurrentWindow(ImGuiWindow* window)
|
|
|
if (window)
|
|
|
{
|
|
|
g.FontSize = g.DrawListSharedData.FontSize = window->CalcFontSize();
|
|
|
+ g.FontScale = g.FontSize / g.Font->FontSize;
|
|
|
ImGui::NavUpdateCurrentWindowIsScrollPushableX();
|
|
|
}
|
|
|
}
|
|
|
@@ -5372,13 +5385,13 @@ void ImGui::EndFrame()
|
|
|
|
|
|
// Notify Platform/OS when our Input Method Editor cursor has moved (e.g. CJK inputs using Microsoft IME)
|
|
|
ImGuiPlatformImeData* ime_data = &g.PlatformImeData;
|
|
|
- if (g.IO.SetPlatformImeDataFn && memcmp(ime_data, &g.PlatformImeDataPrev, sizeof(ImGuiPlatformImeData)) != 0)
|
|
|
+ if (g.IO.PlatformSetImeDataFn != NULL && memcmp(ime_data, &g.PlatformImeDataPrev, sizeof(ImGuiPlatformImeData)) != 0)
|
|
|
{
|
|
|
ImGuiViewport* viewport = FindViewportByID(g.PlatformImeViewport);
|
|
|
- IMGUI_DEBUG_LOG_IO("[io] Calling io.SetPlatformImeDataFn(): WantVisible: %d, InputPos (%.2f,%.2f)\n", ime_data->WantVisible, ime_data->InputPos.x, ime_data->InputPos.y);
|
|
|
+ IMGUI_DEBUG_LOG_IO("[io] Calling io.PlatformSetImeDataFn(): WantVisible: %d, InputPos (%.2f,%.2f)\n", ime_data->WantVisible, ime_data->InputPos.x, ime_data->InputPos.y);
|
|
|
if (viewport == NULL)
|
|
|
viewport = GetMainViewport();
|
|
|
- g.IO.SetPlatformImeDataFn(viewport, ime_data);
|
|
|
+ g.IO.PlatformSetImeDataFn(&g, viewport, ime_data);
|
|
|
}
|
|
|
|
|
|
// Hide implicit/fallback "Debug" window if it hasn't been used
|
|
|
@@ -8070,12 +8083,14 @@ void ImGui::SetCurrentFont(ImFont* font)
|
|
|
g.Font = font;
|
|
|
g.FontBaseSize = ImMax(1.0f, g.IO.FontGlobalScale * g.Font->FontSize * g.Font->Scale);
|
|
|
g.FontSize = g.CurrentWindow ? g.CurrentWindow->CalcFontSize() : 0.0f;
|
|
|
+ g.FontScale = g.FontSize / g.Font->FontSize;
|
|
|
|
|
|
ImFontAtlas* atlas = g.Font->ContainerAtlas;
|
|
|
g.DrawListSharedData.TexUvWhitePixel = atlas->TexUvWhitePixel;
|
|
|
g.DrawListSharedData.TexUvLines = atlas->TexUvLines;
|
|
|
g.DrawListSharedData.Font = g.Font;
|
|
|
g.DrawListSharedData.FontSize = g.FontSize;
|
|
|
+ g.DrawListSharedData.FontScale = g.FontScale;
|
|
|
}
|
|
|
|
|
|
void ImGui::PushFont(ImFont* font)
|
|
|
@@ -8674,6 +8689,7 @@ void ImGui::SetWindowFontScale(float scale)
|
|
|
ImGuiWindow* window = GetCurrentWindow();
|
|
|
window->FontWindowScale = scale;
|
|
|
g.FontSize = g.DrawListSharedData.FontSize = window->CalcFontSize();
|
|
|
+ g.FontScale = g.DrawListSharedData.FontScale = g.FontSize / g.Font->FontSize;
|
|
|
}
|
|
|
|
|
|
void ImGui::PushFocusScope(ImGuiID id)
|
|
|
@@ -19824,6 +19840,10 @@ static void ImGui::DockSettingsHandler_WriteAll(ImGuiContext* ctx, ImGuiSettings
|
|
|
//-----------------------------------------------------------------------------
|
|
|
// [SECTION] PLATFORM DEPENDENT HELPERS
|
|
|
//-----------------------------------------------------------------------------
|
|
|
+// - Default clipboard handlers
|
|
|
+// - Default shell function handlers
|
|
|
+// - Default IME handlers
|
|
|
+//-----------------------------------------------------------------------------
|
|
|
|
|
|
#if defined(_WIN32) && !defined(IMGUI_DISABLE_WIN32_FUNCTIONS) && !defined(IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCTIONS)
|
|
|
|
|
|
@@ -19949,7 +19969,40 @@ static void SetClipboardTextFn_DefaultImpl(void* user_data_ctx, const char* text
|
|
|
g.ClipboardHandlerData[(int)(text_end - text)] = 0;
|
|
|
}
|
|
|
|
|
|
+#endif // Default clipboard handlers
|
|
|
+
|
|
|
+//-----------------------------------------------------------------------------
|
|
|
+
|
|
|
+#if defined(__APPLE__) && defined(TARGET_OS_IPHONE) && !defined(IMGUI_DISABLE_DEFAULT_SHELL_FUNCTIONS)
|
|
|
+#define IMGUI_DISABLE_DEFAULT_SHELL_FUNCTIONS
|
|
|
+#endif
|
|
|
+
|
|
|
+#if defined(_WIN32) && !defined(IMGUI_DISABLE_WIN32_FUNCTIONS) && !defined(IMGUI_DISABLE_DEFAULT_SHELL_FUNCTIONS)
|
|
|
+#include <shellapi.h> // ShellExecuteA()
|
|
|
+#ifdef _MSC_VER
|
|
|
+#pragma comment(lib, "shell32")
|
|
|
#endif
|
|
|
+static void PlatformOpenInShellFn_DefaultImpl(ImGuiContext*, const char* path)
|
|
|
+{
|
|
|
+ ::ShellExecuteA(NULL, "open", path, NULL, NULL, SW_SHOWDEFAULT);
|
|
|
+}
|
|
|
+#elif !defined(IMGUI_DISABLE_DEFAULT_SHELL_FUNCTIONS)
|
|
|
+static void PlatformOpenInShellFn_DefaultImpl(ImGuiContext*, const char* path)
|
|
|
+{
|
|
|
+#if __APPLE__
|
|
|
+ const char* open_executable = "open";
|
|
|
+#else
|
|
|
+ const char* open_executable = "xdg-open";
|
|
|
+#endif
|
|
|
+ ImGuiTextBuffer buf;
|
|
|
+ buf.appendf("%s \"%s\"", open_executable, path);
|
|
|
+ system(buf.c_str());
|
|
|
+}
|
|
|
+#else
|
|
|
+static void PlatformOpenInShellFn_DefaultImpl(ImGuiContext*, const char*) {}
|
|
|
+#endif // Default shell handlers
|
|
|
+
|
|
|
+//-----------------------------------------------------------------------------
|
|
|
|
|
|
// Win32 API IME support (for Asian languages, etc.)
|
|
|
#if defined(_WIN32) && !defined(IMGUI_DISABLE_WIN32_FUNCTIONS) && !defined(IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS)
|
|
|
@@ -19959,7 +20012,7 @@ static void SetClipboardTextFn_DefaultImpl(void* user_data_ctx, const char* text
|
|
|
#pragma comment(lib, "imm32")
|
|
|
#endif
|
|
|
|
|
|
-static void SetPlatformImeDataFn_DefaultImpl(ImGuiViewport* viewport, ImGuiPlatformImeData* data)
|
|
|
+static void PlatformSetImeDataFn_DefaultImpl(ImGuiContext*, ImGuiViewport* viewport, ImGuiPlatformImeData* data)
|
|
|
{
|
|
|
// Notify OS Input Method Editor of text input position
|
|
|
HWND hwnd = (HWND)viewport->PlatformHandleRaw;
|
|
|
@@ -19985,9 +20038,9 @@ static void SetPlatformImeDataFn_DefaultImpl(ImGuiViewport* viewport, ImGuiPlatf
|
|
|
|
|
|
#else
|
|
|
|
|
|
-static void SetPlatformImeDataFn_DefaultImpl(ImGuiViewport*, ImGuiPlatformImeData*) {}
|
|
|
+static void PlatformSetImeDataFn_DefaultImpl(ImGuiContext*, ImGuiViewport*, ImGuiPlatformImeData*) {}
|
|
|
|
|
|
-#endif
|
|
|
+#endif // Default IME handlers
|
|
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
// [SECTION] METRICS/DEBUGGER WINDOW
|
|
|
@@ -21589,6 +21642,22 @@ void ImGui::ShowDebugLogWindow(bool* p_open)
|
|
|
SameLine();
|
|
|
if (SmallButton("Copy"))
|
|
|
SetClipboardText(g.DebugLogBuf.c_str());
|
|
|
+ SameLine();
|
|
|
+ if (SmallButton("Configure Outputs.."))
|
|
|
+ OpenPopup("Outputs");
|
|
|
+ if (BeginPopup("Outputs"))
|
|
|
+ {
|
|
|
+ CheckboxFlags("OutputToTTY", &g.DebugLogFlags, ImGuiDebugLogFlags_OutputToTTY);
|
|
|
+#ifndef IMGUI_ENABLE_TEST_ENGINE
|
|
|
+ BeginDisabled();
|
|
|
+#endif
|
|
|
+ CheckboxFlags("OutputToTestEngine", &g.DebugLogFlags, ImGuiDebugLogFlags_OutputToTestEngine);
|
|
|
+#ifndef IMGUI_ENABLE_TEST_ENGINE
|
|
|
+ EndDisabled();
|
|
|
+#endif
|
|
|
+ EndPopup();
|
|
|
+ }
|
|
|
+
|
|
|
BeginChild("##log", ImVec2(0.0f, 0.0f), ImGuiChildFlags_Border, ImGuiWindowFlags_AlwaysVerticalScrollbar | ImGuiWindowFlags_AlwaysHorizontalScrollbar);
|
|
|
|
|
|
const ImGuiDebugLogFlags backup_log_flags = g.DebugLogFlags;
|
|
|
@@ -21949,8 +22018,6 @@ void ImGui::DebugNodeWindowSettings(ImGuiWindowSettings*) {}
|
|
|
void ImGui::DebugNodeWindowsList(ImVector<ImGuiWindow*>*, const char*) {}
|
|
|
void ImGui::DebugNodeViewport(ImGuiViewportP*) {}
|
|
|
|
|
|
-void ImGui::DebugLog(const char*, ...) {}
|
|
|
-void ImGui::DebugLogV(const char*, va_list) {}
|
|
|
void ImGui::ShowDebugLogWindow(bool*) {}
|
|
|
void ImGui::ShowIDStackToolWindow(bool*) {}
|
|
|
void ImGui::DebugStartItemPicker() {}
|
ocornut