reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-28 22:20:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

winex11.drv: Map zero-sized windows but don't add WM decoration to them.

Browse Source
This commit is contained in:
Dmitry Timoshkov 2008-04-16 16:50:29 +09:00 committed by Alexandre Julliard
parent 8988ab8f8d
commit 15c0bcb3d8
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/winex11.drv/window.c
View File

@ -113,9 +113,6 @@ BOOL is_window_managed( HWND hwnd, UINT swp_flags, const RECT *window_rect )
*/ */
BOOL X11DRV_is_window_rect_mapped( const RECT *rect ) BOOL X11DRV_is_window_rect_mapped( const RECT *rect )
{ {
/* don't map if rect is empty */
if (IsRectEmpty( rect )) return FALSE;
/* don't map if rect is off-screen */ /* don't map if rect is off-screen */
if (rect->left >= virtual_screen_rect.right || if (rect->left >= virtual_screen_rect.right ||
rect->top >= virtual_screen_rect.bottom || rect->top >= virtual_screen_rect.bottom ||
@ -144,11 +141,14 @@ static inline BOOL is_window_resizable( struct x11drv_win_data *data, DWORD styl
/*********************************************************************** /***********************************************************************
* get_mwm_decorations * get_mwm_decorations
*/ */
static unsigned long get_mwm_decorations( DWORD style, DWORD ex_style ) static unsigned long get_mwm_decorations( struct x11drv_win_data *data,
DWORD style, DWORD ex_style )
{ {
unsigned long ret = 0; unsigned long ret = 0;
if (!decorated_mode) return ret; if (!decorated_mode) return 0;
if (IsRectEmpty( &data->window_rect )) return 0;
if (ex_style & WS_EX_TOOLWINDOW) return 0; if (ex_style & WS_EX_TOOLWINDOW) return 0;
@ -180,7 +180,7 @@ static void get_x11_rect_offset( struct x11drv_win_data *data, RECT *rect )
style = GetWindowLongW( data->hwnd, GWL_STYLE ); style = GetWindowLongW( data->hwnd, GWL_STYLE );
ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE );
decor = get_mwm_decorations( style, ex_style ); decor = get_mwm_decorations( data, style, ex_style );
if (decor & MWM_DECOR_TITLE) style_mask |= WS_CAPTION; if (decor & MWM_DECOR_TITLE) style_mask |= WS_CAPTION;
if (decor & MWM_DECOR_BORDER) if (decor & MWM_DECOR_BORDER)
@ -876,7 +876,7 @@ void X11DRV_set_wm_hints( Display *display, struct x11drv_win_data *data )
XA_ATOM, 32, PropModeReplace, (unsigned char*)&window_type, 1); XA_ATOM, 32, PropModeReplace, (unsigned char*)&window_type, 1);
mwm_hints.flags = MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS; mwm_hints.flags = MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS;
mwm_hints.decorations = get_mwm_decorations( style, ex_style ); mwm_hints.decorations = get_mwm_decorations( data, style, ex_style );
mwm_hints.functions = MWM_FUNC_MOVE; mwm_hints.functions = MWM_FUNC_MOVE;
if (is_window_resizable( data, style )) mwm_hints.functions |= MWM_FUNC_RESIZE; if (is_window_resizable( data, style )) mwm_hints.functions |= MWM_FUNC_RESIZE;
if (style & WS_MINIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MINIMIZE; if (style & WS_MINIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MINIMIZE;