mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2025-10-02 16:18:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed io.ConfigDpiScaleFonts from ever working since 1.92. (#8832, #8465)

Browse Source 
Merge fix e4055e763 didn't update the code properly.
This commit is contained in:
ocornut
2025-09-12 11:44:52 +02:00
parent 0457a09bb9
commit e8ca7af4c0
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docs/CHANGELOG.txt
View File

@@ -102,6 +102,11 @@ Other Changes:
Docking+Viewports Branch: Docking+Viewports Branch:
- DPI: fixed io.ConfigDpiScaleFonts from ever working since 1.92 (the irony
being that it is when it started to make sense!). As a reminder, the option
automatically copy the _current_ viewport DpiScale to style.FontScaleDpi.
This is why we separated the style.FontScaleMain and style.FontScaleDpi scaling
factor, as the later is meant to be overwritten. (#8832, #8465)
- DPI: Fixed obsoleted ImGuiConfigFlags_DpiEnableScaleFonts/_DpiEnableScaleViewports - DPI: Fixed obsoleted ImGuiConfigFlags_DpiEnableScaleFonts/_DpiEnableScaleViewports
names from setting the equivalent io.ConfigDpiScaleFonts/io.ConfigDpiScaleViewports names from setting the equivalent io.ConfigDpiScaleFonts/io.ConfigDpiScaleViewports
flag correctly (regression in 1.92). flag correctly (regression in 1.92).

2
imgui.cpp
View File

@@ -16254,6 +16254,8 @@ void ImGui::SetCurrentViewport(ImGuiWindow* current_window, ImGuiViewportP* view
g.CurrentViewport = viewport; g.CurrentViewport = viewport;
IM_ASSERT(g.CurrentDpiScale > 0.0f && g.CurrentDpiScale < 99.0f); // Typical correct values would be between 1.0f and 4.0f IM_ASSERT(g.CurrentDpiScale > 0.0f && g.CurrentDpiScale < 99.0f); // Typical correct values would be between 1.0f and 4.0f
//IMGUI_DEBUG_LOG_VIEWPORT("[viewport] SetCurrentViewport changed '%s' 0x%08X\n", current_window ? current_window->Name : NULL, viewport ? viewport->ID : 0); //IMGUI_DEBUG_LOG_VIEWPORT("[viewport] SetCurrentViewport changed '%s' 0x%08X\n", current_window ? current_window->Name : NULL, viewport ? viewport->ID : 0);
if (g.IO.ConfigDpiScaleFonts)
g.Style.FontScaleDpi = g.CurrentDpiScale;
// Notify platform layer of viewport changes // Notify platform layer of viewport changes
// FIXME-DPI: This is only currently used for experimenting with handling of multiple DPI // FIXME-DPI: This is only currently used for experimenting with handling of multiple DPI