diff options
author | Harley Acheson <harley.acheson@gmail.com> | 2019-12-06 03:50:30 +0300 |
---|---|---|
committer | Harley Acheson <harley.acheson@gmail.com> | 2019-12-06 03:50:30 +0300 |
commit | 601eafd104ca66e3baaa45e9ecb00989395c55d9 (patch) | |
tree | 7e861ea4c75f9853b0e6fba212263cb8413ecc8e | |
parent | 61a02a7aa1cabc504da3e5ca55f7e65d9b7aaf50 (diff) |
Fix T72118: Enable Windows 10 Non-client DPI Scaling
Enables Windows 10 feature that automatically adjusts non-client area (title bar) on high-DPI displays.
Differential Revision: https://developer.blender.org/D6370
Reviewed by Brecht Van Lommel
-rw-r--r-- | intern/ghost/intern/GHOST_SystemWin32.cpp | 7 | ||||
m--------- | release/datafiles/locale | 0 | ||||
m--------- | release/scripts/addons | 0 | ||||
m--------- | release/scripts/addons_contrib | 0 |
4 files changed, 2 insertions, 5 deletions
diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp index 323722173d4..79e38de414f 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.cpp +++ b/intern/ghost/intern/GHOST_SystemWin32.cpp @@ -1156,9 +1156,8 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam, GHOST_ASSERT(system, "GHOST_SystemWin32::s_wndProc(): system not initialized"); if (hwnd) { -#if 0 - // Disabled due to bug in Intel drivers, see T51959 - if (msg == WM_NCCREATE) { + + if (msg == WM_NCCREATE) { // Tell Windows to automatically handle scaling of non-client areas // such as the caption bar. EnableNonClientDpiScaling was introduced in Windows 10 HMODULE m_user32 = ::LoadLibrary("User32.dll"); @@ -1166,13 +1165,11 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam, GHOST_WIN32_EnableNonClientDpiScaling fpEnableNonClientDpiScaling = (GHOST_WIN32_EnableNonClientDpiScaling)::GetProcAddress(m_user32, "EnableNonClientDpiScaling"); - if (fpEnableNonClientDpiScaling) { fpEnableNonClientDpiScaling(hwnd); } } } -#endif GHOST_WindowWin32 *window = (GHOST_WindowWin32 *)::GetWindowLongPtr(hwnd, GWLP_USERDATA); if (window) { diff --git a/release/datafiles/locale b/release/datafiles/locale -Subproject a2fb7b56b6c99ca14aa1dd09659ad0242c1b158 +Subproject b0b6396312e7ceb78826d423f8f152ddba01c03 diff --git a/release/scripts/addons b/release/scripts/addons -Subproject 52b58daa9759d56e45aa6dabd90ec36910e7084 +Subproject 2f425cc128b8b709cc1ebf2c96ad372778f4aed diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib -Subproject af1d8170e6fb19851fd547fe228bceede3375bf +Subproject b52e7760ff6ccbcca73d2bbccc77f70ca2eaf98 |