Start High-DPI support by scaling the parent window according to the DPI.

1 files changed, 82 insertions, 8 deletions

diff --git a/src/dutil/thmutil.cpp b/src/dutil/thmutil.cpp
index 2050b420..4cc149c9 100644
--- a/src/dutil/thmutil.cpp
+++ b/src/dutil/thmutil.cpp
@@ -287,6 +287,11 @@ static BOOL OnButtonClicked(
     __in HWND hWnd,
     __in const THEME_CONTROL* pControl
     );
+static BOOL OnDpiChanged(
+    __in THEME* pTheme,
+    __in WPARAM wParam,
+    __in LPARAM lParam
+    );
 static void OnNcCreate(
     __in THEME* pTheme,
     __in HWND hWnd,
@@ -353,6 +358,12 @@ static void ResizeControl(
     __in THEME_CONTROL* pControl,
     __in const RECT* prcParent
     );
+static void ScaleTheme(
+    __in THEME* pTheme,
+    __in UINT nDpi,
+    __in int x,
+    __in int y
+    );
 static void GetControls(
     __in THEME* pTheme,
     __in_opt THEME_CONTROL* pParentControl,
@@ -380,6 +391,8 @@ DAPI_(HRESULT) ThemeInitialize(
     HRESULT hr = S_OK;
     INITCOMMONCONTROLSEX icex = { };
 
+    DpiuInitialize();
+
     hr = XmlInitialize();
     ThmExitOnFailure(hr, "Failed to initialize XML.");
 
@@ -430,6 +443,7 @@ DAPI_(void) ThemeUninitialize()
     }
 
     XmlUninitialize();
+    DpiuUninitialize();
 }
 
 
@@ -797,10 +811,10 @@ extern "C" LRESULT CALLBACK ThemeDefWindowProc(
             }
             break;
 
-        case WM_WINDOWPOSCHANGED:
+        case WM_DPICHANGED:
+            if (OnDpiChanged(pTheme, wParam, lParam))
             {
-                //WINDOWPOS* pos = reinterpret_cast<LPWINDOWPOS>(lParam);
-                //ThemeWindowPositionChanged(pTheme, pos);
+                return 0;
             }
             break;
 
@@ -1652,6 +1666,7 @@ static HRESULT ParseTheme(
     ThmExitOnNull(pTheme, hr, E_OUTOFMEMORY, "Failed to allocate memory for theme.");
 
     pTheme->wId = ++wThemeId;
+    pTheme->nDpi = USER_DEFAULT_SCREEN_DPI;
 
     // Parse the optional background resource image.
     hr = ParseImage(hModule, wzRelativePath, pThemeElement, &pTheme->hImage);
@@ -1816,6 +1831,7 @@ static HRESULT ParseWindow(
 {
     HRESULT hr = S_OK;
     IXMLDOMNode* pixn = NULL;
+    DWORD dwValue = 0;
     BSTR bstr = NULL;
     LPWSTR sczIconFile = NULL;
 
@@ -1833,7 +1849,7 @@ static HRESULT ParseWindow(
     }
     ThmExitOnFailure(hr, "Failed to get window AutoResize attribute.");
 
-    hr = XmlGetAttributeNumber(pixn, L"Width", reinterpret_cast<DWORD*>(&pTheme->nWidth));
+    hr = XmlGetAttributeNumber(pixn, L"Width", &dwValue);
     if (S_FALSE == hr)
     {
         hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
@@ -1841,7 +1857,9 @@ static HRESULT ParseWindow(
     }
     ThmExitOnFailure(hr, "Failed to get window Width attribute.");
 
-    hr = XmlGetAttributeNumber(pixn, L"Height", reinterpret_cast<DWORD*>(&pTheme->nHeight));
+    pTheme->nWidth = pTheme->nDefaultDpiWidth = dwValue;
+
+    hr = XmlGetAttributeNumber(pixn, L"Height", &dwValue);
     if (S_FALSE == hr)
     {
         hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
@@ -1849,20 +1867,28 @@ static HRESULT ParseWindow(
     }
     ThmExitOnFailure(hr, "Failed to get window Height attribute.");
 
-    hr = XmlGetAttributeNumber(pixn, L"MinimumWidth", reinterpret_cast<DWORD*>(&pTheme->nMinimumWidth));
+    pTheme->nHeight = pTheme->nDefaultDpiHeight = dwValue;
+
+    hr = XmlGetAttributeNumber(pixn, L"MinimumWidth", &dwValue);
     if (S_FALSE == hr)
     {
+        dwValue = 0;
         hr = S_OK;
     }
     ThmExitOnFailure(hr, "Failed to get window MinimumWidth attribute.");
 
-    hr = XmlGetAttributeNumber(pixn, L"MinimumHeight", reinterpret_cast<DWORD*>(&pTheme->nMinimumHeight));
+    pTheme->nMinimumWidth = pTheme->nDefaultDpiMinimumWidth = dwValue;
+
+    hr = XmlGetAttributeNumber(pixn, L"MinimumHeight", &dwValue);
     if (S_FALSE == hr)
     {
+        dwValue = 0;
         hr = S_OK;
     }
     ThmExitOnFailure(hr, "Failed to get window MinimumHeight attribute.");
 
+    pTheme->nMinimumHeight = pTheme->nDefaultDpiMinimumHeight = dwValue;
+
     hr = XmlGetAttributeNumber(pixn, L"FontId", &pTheme->dwFontId);
     if (S_FALSE == hr)
     {
@@ -4161,14 +4187,45 @@ static BOOL OnButtonClicked(
 LExit:
     return fHandled;
 }
+    
+static BOOL OnDpiChanged(
+    __in THEME* pTheme,
+    __in WPARAM wParam,
+    __in LPARAM lParam
+    )
+{
+    UINT nDpi = HIWORD(wParam);
+    RECT* pRect = reinterpret_cast<RECT*>(lParam);
+    BOOL fIgnored = pTheme->nDpi == nDpi;
+
+    if (fIgnored)
+    {
+        ExitFunction();
+    }
+
+    ScaleTheme(pTheme, nDpi, pRect->left, pRect->top);
+
+LExit:
+    return !fIgnored;
+}
 
 static void OnNcCreate(
     __in THEME* pTheme,
     __in HWND hWnd,
-    __in LPARAM /*lParam*/
+    __in LPARAM lParam
     )
 {
+    DPIU_WINDOW_CONTEXT windowContext = { };
+    CREATESTRUCTW* pCreateStruct = reinterpret_cast<CREATESTRUCTW*>(lParam);
+
     pTheme->hwndParent = hWnd;
+
+    DpiuGetWindowContext(pTheme->hwndParent, &windowContext);
+
+    if (windowContext.nDpi != pTheme->nDpi)
+    {
+        ScaleTheme(pTheme, windowContext.nDpi, pCreateStruct->x, pCreateStruct->y);
+    }
 }
 
 static HRESULT OnRichEditEnLink(
@@ -5282,6 +5339,23 @@ static void ResizeControl(
     }
 }
 
+static void ScaleTheme(
+    __in THEME* pTheme,
+    __in UINT nDpi,
+    __in int x,
+    __in int y
+    )
+{
+    pTheme->nDpi = nDpi;
+
+    pTheme->nHeight = DpiuScaleValue(pTheme->nDefaultDpiHeight, pTheme->nDpi);
+    pTheme->nWidth = DpiuScaleValue(pTheme->nDefaultDpiWidth, pTheme->nDpi);
+    pTheme->nMinimumHeight = DpiuScaleValue(pTheme->nDefaultDpiMinimumHeight, pTheme->nDpi);
+    pTheme->nMinimumWidth = DpiuScaleValue(pTheme->nDefaultDpiMinimumWidth, pTheme->nDpi);
+
+    ::SetWindowPos(pTheme->hwndParent, NULL, x, y, pTheme->nWidth, pTheme->nHeight, SWP_NOACTIVATE | SWP_NOZORDER);
+}
+
 static void UnloadControls(
     __in DWORD cControls,
     __in THEME_CONTROL* rgControls