From 601eafd104ca66e3baaa45e9ecb00989395c55d9 Mon Sep 17 00:00:00 2001 From: Harley Acheson Date: Thu, 5 Dec 2019 16:50:30 -0800 Subject: 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 --- intern/ghost/intern/GHOST_SystemWin32.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'intern') 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) { -- cgit v1.2.3