fix playlist scrollbar glitch in Windows 7 (#2919)

clsid2 · Jul 13, 2024 · bdb25a2 · bdb25a2
1 parent 85c03f4
commit bdb25a2
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/src/mpc-hc/CMPCThemeScrollBarHelper.cpp b/src/mpc-hc/CMPCThemeScrollBarHelper.cpp
@@ -61,6 +61,10 @@ void CMPCThemeScrollBarHelper::setWindowRegionExclusive(HRGN h) {
 void CMPCThemeScrollBarHelper::hideNativeScrollBars()
 {
 
+    if (!CMPCThemeUtil::IsWindowVisibleAndRendered(window)) {
+        return;
+    }
+
     bool windowChanged = helperInfo.UpdateHelperInfo(window);
 
     ScrollBarHelperInfo& i = helperInfo;

diff --git a/src/mpc-hc/CMPCThemeUtil.cpp b/src/mpc-hc/CMPCThemeUtil.cpp
@@ -1243,3 +1243,17 @@ void CMPCThemeUtil::AdjustDynamicWidgetPair(CWnd* window, int leftWidget, int ri
         }
     }
 }
+
+bool CMPCThemeUtil::IsWindowVisibleAndRendered(CWnd* window) {
+    if (!window || !IsWindow(window->m_hWnd) || !window->IsWindowVisible()) {
+        return false;
+    } else {
+        CRect r;
+        HDC hdc = GetWindowDC(window->m_hWnd);
+        GetClipBox(hdc, &r);
+        if (r.IsRectEmpty()) {
+            return false;
+        }
+    }
+    return true;
+}
diff --git a/src/mpc-hc/CMPCThemeUtil.h b/src/mpc-hc/CMPCThemeUtil.h
@@ -109,6 +109,7 @@ class CMPCThemeUtil
     static void fulfillThemeReqs(CProgressCtrl* ctl);
     static void enableWindows10DarkFrame(CWnd* window);
     static void AdjustDynamicWidgetPair(CWnd* window, int left, int right, WidgetPairType lType = WidgetPairAuto, WidgetPairType rType = WidgetPairAuto);
+    static bool IsWindowVisibleAndRendered(CWnd* window);
 
     void PreDoModalRTL(LPPROPSHEETHEADERW m_psh);