Merge pull request #724 from jdpurcell/pr-winperdisplayicc

Windows: Fix ICC profile detection not working per-monitor
jurplel · Oct 19, 2024 · 909e013 · 909e013
2 parents e083114 + fcea73f
commit 909e013
Showing 1 changed file with 20 additions and 11 deletions.
diff --git a/src/qvwin32functions.cpp b/src/qvwin32functions.cpp
@@ -165,22 +165,31 @@ QByteArray QVWin32Functions::getIccProfileForWindow(const QWindow *window)
 {
     QByteArray result;
     const HWND hWnd = reinterpret_cast<HWND>(window->winId());
-    const HDC hDC = GetDC(hWnd);
-    if (hDC)
+    const HMONITOR hMonitor = MonitorFromWindow(hWnd, MONITOR_DEFAULTTONEAREST);
+    if (hMonitor)
     {
-        WCHAR profilePathBuff[MAX_PATH];
-        DWORD profilePathSize = MAX_PATH;
-        if (GetICMProfileW(hDC, &profilePathSize, profilePathBuff))
+        MONITORINFOEXW monitorInfo;
+        monitorInfo.cbSize = sizeof(MONITORINFOEXW);
+        if (GetMonitorInfoW(hMonitor, &monitorInfo))
         {
-            QString profilePath = QString::fromWCharArray(profilePathBuff);
-            QFile file(profilePath);
-            if (file.open(QIODevice::ReadOnly))
+            const HDC hDC = CreateICW(monitorInfo.szDevice, monitorInfo.szDevice, NULL, NULL);
+            if (hDC)
             {
-                result = file.readAll();
-                file.close();
+                WCHAR profilePathBuff[MAX_PATH];
+                DWORD profilePathSize = MAX_PATH;
+                if (GetICMProfileW(hDC, &profilePathSize, profilePathBuff))
+                {
+                    QString profilePath = QString::fromWCharArray(profilePathBuff);
+                    QFile file(profilePath);
+                    if (file.open(QIODevice::ReadOnly))
+                    {
+                        result = file.readAll();
+                        file.close();
+                    }
+                }
+                ReleaseDC(hWnd, hDC);
             }
         }
-        ReleaseDC(hWnd, hDC);
     }
     return result;
 }