[Bf-blender-cvs] [f641c60530f] blender-v2.81-release: Fix T70991: Maximized file browser hides file name bar on Windows

Julian Eisel noreply at git.blender.org
Fri Nov 15 15:34:50 CET 2019


Commit: f641c60530fbd8b79575685cfbdf332e673951b0
Author: Julian Eisel
Date:   Fri Nov 15 16:05:38 2019 +0100
Branches: blender-v2.81-release
https://developer.blender.org/rBf641c60530fbd8b79575685cfbdf332e673951b0

Fix T70991: Maximized file browser hides file name bar on Windows

`WS_CHILD` is a different kind of child window that what we define as
child window. See http://forums.codeguru.com/showthread.php?491604.

Setting this style flag seems to mess things up a bit in our
configuration. The name bar is actually being overlapped by the Windows
task bar then. Not totally sure why this happens, but I think it's
because windows with the `WS_CHILD` style are positioned relative to the
parent, not the desktop (screen without taskbar). So it uses the full
space available when maximized, which isn't clipped by the taskbar
anymore.

===================================================================

M	intern/ghost/intern/GHOST_WindowWin32.cpp

===================================================================

diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp
index e1c6aa1109c..fd9e0240b1b 100644
--- a/intern/ghost/intern/GHOST_WindowWin32.cpp
+++ b/intern/ghost/intern/GHOST_WindowWin32.cpp
@@ -270,10 +270,8 @@ GHOST_WindowWin32::GHOST_WindowWin32(GHOST_SystemWin32 *system,
   }
 
   if (dialog && parentwindow) {
-    ::SetWindowLongPtr(m_hWnd,
-                       GWL_STYLE,
-                       WS_VISIBLE | WS_CHILD | WS_POPUPWINDOW | WS_CAPTION | WS_MAXIMIZEBOX |
-                           WS_SIZEBOX);
+    ::SetWindowLongPtr(
+        m_hWnd, GWL_STYLE, WS_VISIBLE | WS_POPUPWINDOW | WS_CAPTION | WS_MAXIMIZEBOX | WS_SIZEBOX);
     ::SetWindowLongPtr(m_hWnd, GWLP_HWNDPARENT, (LONG_PTR)m_parentWindowHwnd);
     ::SetWindowPos(
         m_hWnd, 0, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED);



More information about the Bf-blender-cvs mailing list