Alexandre Julliard : winex11: Leave it up to explorer to specify the correct size and position for the desktop .
Alexandre Julliard
julliard at winehq.org
Wed Jan 23 05:25:01 CST 2008
Module: wine
Branch: master
Commit: a76abc032270afbc458e4698f3558fb09bbaa6b6
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a76abc032270afbc458e4698f3558fb09bbaa6b6
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Jan 23 11:31:07 2008 +0100
winex11: Leave it up to explorer to specify the correct size and position for the desktop.
---
dlls/winex11.drv/window.c | 4 ----
programs/explorer/desktop.c | 11 ++++-------
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
index 3948b1a..3334e61 100644
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -1234,10 +1234,6 @@ static void get_desktop_xwin( Display *display, struct x11drv_win_data *data )
SetPropA( data->hwnd, visual_id_prop, (HANDLE)visualid );
set_initial_wm_hints( display, data );
}
- SetWindowPos( data->hwnd, 0, virtual_screen_rect.left, virtual_screen_rect.top,
- virtual_screen_rect.right - virtual_screen_rect.left,
- virtual_screen_rect.bottom - virtual_screen_rect.top,
- SWP_NOZORDER | SWP_NOACTIVATE );
}
/**********************************************************************
diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c
index 8d03094..224f0de 100644
--- a/programs/explorer/desktop.c
+++ b/programs/explorer/desktop.c
@@ -181,17 +181,14 @@ void manage_desktop( char *arg )
xwin = create_desktop( "Default", width, height );
}
- if (!xwin) /* using the root window */
- {
- using_root = TRUE;
- width = GetSystemMetrics(SM_CXSCREEN);
- height = GetSystemMetrics(SM_CYSCREEN);
- }
+ if (!xwin) using_root = TRUE; /* using the root window */
/* create the desktop window */
hwnd = CreateWindowExW( 0, DESKTOP_CLASS_ATOM, NULL,
WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN,
- 0, 0, width, height, 0, 0, 0, NULL );
+ GetSystemMetrics(SM_XVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN),
+ GetSystemMetrics(SM_CXVIRTUALSCREEN), GetSystemMetrics(SM_CYVIRTUALSCREEN),
+ 0, 0, 0, NULL );
if (hwnd == GetDesktopWindow())
{
SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)desktop_wnd_proc );
More information about the wine-cvs
mailing list