Alexandre Julliard : winex11: Don't force tool windows to unmanaged mode.

Alexandre Julliard julliard at winehq.org
Fri Apr 25 08:11:11 CDT 2008


Module: wine
Branch: master
Commit: 1f99d80c06994aeb8b2fa959c477a77c79184980
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1f99d80c06994aeb8b2fa959c477a77c79184980

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Apr 25 14:26:52 2008 +0200

winex11: Don't force tool windows to unmanaged mode.

The detection algorithm should be good enough for that case now.

---

 dlls/winex11.drv/window.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
index 3658c71..0f84ae2 100644
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -101,13 +101,8 @@ static BOOL is_window_managed( HWND hwnd, UINT swp_flags, const RECT *window_rec
     if (hwnd == GetActiveWindow()) return TRUE;
     /* windows with caption are managed */
     if ((style & WS_CAPTION) == WS_CAPTION) return TRUE;
-    /* tool windows are not managed  */
-    ex_style = GetWindowLongW( hwnd, GWL_EXSTYLE );
-    if (ex_style & WS_EX_TOOLWINDOW) return FALSE;
     /* windows with thick frame are managed */
     if (style & WS_THICKFRAME) return TRUE;
-    /* application windows are managed */
-    if (ex_style & WS_EX_APPWINDOW) return TRUE;
     if (style & WS_POPUP)
     {
         /* popup with sysmenu == caption are managed */
@@ -117,6 +112,9 @@ static BOOL is_window_managed( HWND hwnd, UINT swp_flags, const RECT *window_rec
             window_rect->top <= 0 && window_rect->bottom >= screen_height)
             return TRUE;
     }
+    /* application windows are managed */
+    ex_style = GetWindowLongW( hwnd, GWL_EXSTYLE );
+    if (ex_style & WS_EX_APPWINDOW) return TRUE;
     /* default: not managed */
     return FALSE;
 }




More information about the wine-cvs mailing list