diff --git a/imgui.cpp b/imgui.cpp index 077154a41..3db1c5f85 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -4491,7 +4491,7 @@ ImGuiWindow::ImGuiWindow(ImGuiContext* ctx, const char* name) : DrawListInst(NUL LastFrameJustFocused = -1; LastTimeActive = -1.0f; FontRefSize = 0.0f; - FontWindowScale = FontWindowScaleParents = FontDpiScale = 1.0f; + FontWindowScale = FontWindowScaleParents = 1.0f; SettingsOffset = -1; DockOrder = -1; DrawList = &DrawListInst; @@ -7833,7 +7833,6 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags) WindowSelectViewport(window); SetCurrentViewport(window, window->Viewport); - window->FontDpiScale = g.IO.ConfigDpiScaleFonts ? window->Viewport->DpiScale : 1.0f; SetCurrentWindow(window); flags = window->Flags; @@ -7978,7 +7977,6 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags) // FIXME-DPI //IM_ASSERT(old_viewport->DpiScale == window->Viewport->DpiScale); // FIXME-DPI: Something went wrong SetCurrentViewport(window, window->Viewport); - window->FontDpiScale = g.IO.ConfigDpiScaleViewports ? window->Viewport->DpiScale : 1.0f; SetCurrentWindow(window); } diff --git a/imgui.h b/imgui.h index 3ba571647..9ccbf18b2 100644 --- a/imgui.h +++ b/imgui.h @@ -2454,7 +2454,7 @@ struct ImGuiIO // DPI/Scaling options // This may keep evolving during 1.92.x releases. Expect some turbulence. - bool ConfigDpiScaleFonts; // = false // [EXPERIMENTAL] Request bitmap-scaled fonts to match DpiScale. This is a very low-quality workaround. The correct way to handle DPI is _currently_ to replace the atlas and/or fonts in the Platform_OnChangedViewport callback, but this is all early work in progress. + bool ConfigDpiScaleFonts; // = false // [EXPERIMENTAL] Automatically overwrite style.FontScaleDpi when Monitor DPI changes. This will scale fonts but _NOT_ scale sizes/padding for now. bool ConfigDpiScaleViewports; // = false // [EXPERIMENTAL] Scale Dear ImGui and Platform Windows when Monitor DPI changes. // Miscellaneous options diff --git a/imgui_internal.h b/imgui_internal.h index 1de5cf4fc..1dd582ea8 100644 --- a/imgui_internal.h +++ b/imgui_internal.h @@ -2871,7 +2871,6 @@ struct IMGUI_API ImGuiWindow ImVector ColumnsStorage; float FontWindowScale; // User scale multiplier per-window, via SetWindowFontScale() float FontWindowScaleParents; - float FontDpiScale; float FontRefSize; // This is a copy of window->CalcFontSize() at the time of Begin(), trying to phase out CalcFontSize() especially as it may be called on non-current window. int SettingsOffset; // Offset into SettingsWindows[] (offsets are always valid as we only grow the array from the back)