Fixed window resizing when toggling HiDPI

SpecialKO · May 5, 2024 · 0e34a45 · 0e34a45
1 parent c31f8ce
commit 0e34a45
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 33 deletions.
diff --git a/src/SKIF.cpp b/src/SKIF.cpp
@@ -1941,6 +1941,41 @@ wWinMain ( _In_     HINSTANCE hInstance,
                                              SKIF_vecRegularMode ;
     */
 
+    // F6 to toggle DPI scaling
+    if (changedHiDPIScaling || hotkeyF6)
+    {
+      // We only change bDPIScaling if ImGui::Checkbox (settings tab) was not used,
+      //   as otherwise it have already been changed to reflect its new value
+      if (! changedHiDPIScaling)
+        _registry.bDPIScaling =        ! _registry.bDPIScaling;
+      _registry.regKVDPIScaling.putData (_registry.bDPIScaling);
+
+      changedHiDPIScaling = false;
+
+      // Reset reduced height
+      SKIF_vecAlteredSize.y = 0.0f;
+
+      // Take the current display into account
+      HMONITOR monitor =
+        ::MonitorFromWindow (SKIF_ImGui_hWnd, MONITOR_DEFAULTTONEAREST);
+
+      SKIF_ImGui_GlobalDPIScale = (_registry.bDPIScaling) ? ImGui_ImplWin32_GetDpiScaleForMonitor (monitor) : 1.0f;
+
+      // Divide the window size with its associated DPI scale to get the base size, then multiply with the new DPI scale
+      SKIF_vecCurrentModeNext = (SKIF_vecCurrentMode / SKIF_ImGui_GlobalDPIScale_Last) * SKIF_ImGui_GlobalDPIScale;
+
+      ImGuiStyle              newStyle;
+      SKIF_ImGui_SetStyle   (&newStyle);
+
+      SKIF_ImGui_AdjustAppModeSize (monitor);
+
+      LONG_PTR lStyle = GetWindowLongPtr (SKIF_ImGui_hWnd, GWL_STYLE);
+      if (lStyle & WS_MAXIMIZE)
+        repositionToCenter   = true;
+      else
+        RespectMonBoundaries = true;
+    }
+
     static bool
         applySizeOnLaunch = true;
     if (applySizeOnLaunch)
@@ -2074,38 +2109,6 @@ wWinMain ( _In_     HINSTANCE hInstance,
     }
     */
 
-    // F6 to toggle DPI scaling
-    if (changedHiDPIScaling || hotkeyF6)
-    {
-      // We only change bDPIScaling if ImGui::Checkbox (settings tab) was not used,
-      //   as otherwise it have already been changed to reflect its new value
-      if (! changedHiDPIScaling)
-        _registry.bDPIScaling =        ! _registry.bDPIScaling;
-      _registry.regKVDPIScaling.putData (_registry.bDPIScaling);
-
-      changedHiDPIScaling = false;
-
-      // Reset reduced height
-      SKIF_vecAlteredSize.y = 0.0f;
-
-      // Take the current display into account
-      HMONITOR monitor =
-        ::MonitorFromWindow (SKIF_ImGui_hWnd, MONITOR_DEFAULTTONEAREST);
-
-      SKIF_ImGui_GlobalDPIScale = (_registry.bDPIScaling) ? ImGui_ImplWin32_GetDpiScaleForMonitor (monitor) : 1.0f;
-
-      ImGuiStyle              newStyle;
-      SKIF_ImGui_SetStyle   (&newStyle);
-
-      SKIF_ImGui_AdjustAppModeSize (monitor);
-
-      LONG_PTR lStyle = GetWindowLongPtr (SKIF_ImGui_hWnd, GWL_STYLE);
-      if (lStyle & WS_MAXIMIZE)
-        repositionToCenter   = true;
-      else
-        RespectMonBoundaries = true;
-    }
-
     // F8 to toggle UI borders
     if (hotkeyF8)
     {

diff --git a/src/utility/skif_imgui.cpp b/src/utility/skif_imgui.cpp
@@ -355,7 +355,7 @@ SKIF_ImGui_AdjustAppModeSize (HMONITOR monitor)
   {
     ImVec2 WorkSize =
       ImVec2 ( (float)( info.rcWork.right  - info.rcWork.left ),
-                (float)( info.rcWork.bottom - info.rcWork.top  ) );
+               (float)( info.rcWork.bottom - info.rcWork.top  ) );
 
     ImVec2 tmpCurrentSize  = (_registry.bServiceMode) ? SKIF_vecServiceModeDefault  :
                              (_registry.bHorizonMode) ? SKIF_vecHorizonModeAdjusted :