From 24632cd448005a3a1d69dc207cfcf835c39e8be1 Mon Sep 17 00:00:00 2001 From: Martin Fuchs Date: Tue, 21 Oct 2003 20:23:53 +0000 Subject: [PATCH] use WS_EX_TOOLWINDOW for floating menus svn path=/trunk/; revision=6396 --- reactos/subsys/system/explorer/doc/changes.txt | 4 ++++ reactos/subsys/system/explorer/taskbar/startmenu.cpp | 10 ++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/reactos/subsys/system/explorer/doc/changes.txt b/reactos/subsys/system/explorer/doc/changes.txt index 51c383cc440..a7d13efda96 100644 --- a/reactos/subsys/system/explorer/doc/changes.txt +++ b/reactos/subsys/system/explorer/doc/changes.txt @@ -1,3 +1,7 @@ +You will find only major changes in this file. +Small bug fixes and developments steps are not listet here. +If you search for more information, look into the CVS repository. + 14.10.2002 m. fuchs Korrektur der Anpassungen durch Übernahme in wine: Anzeige der Verzeichnisnamen in Tree Pane m. fuchs Wieder-Anpassung an natives Übersetzen unter WIN32 mit VC++ diff --git a/reactos/subsys/system/explorer/taskbar/startmenu.cpp b/reactos/subsys/system/explorer/taskbar/startmenu.cpp index 058547cf763..1f241876afe 100644 --- a/reactos/subsys/system/explorer/taskbar/startmenu.cpp +++ b/reactos/subsys/system/explorer/taskbar/startmenu.cpp @@ -85,20 +85,22 @@ Window::CREATORFUNC StartMenu::s_def_creator = STARTMENU_CREATOR(StartMenu); HWND StartMenu::Create(int x, int y, const StartMenuFolders& folders, HWND hwndParent, LPCTSTR title, CREATORFUNC creator) { - UINT style; + UINT style, ex_style; int top_height; if (hwndParent) { style = WS_POPUP|WS_THICKFRAME|WS_CLIPCHILDREN|WS_VISIBLE; + ex_style = 0; top_height = STARTMENU_TOP_BTN_SPACE; } else { style = WS_POPUP|WS_CAPTION|WS_SYSMENU|WS_CLIPCHILDREN|WS_VISIBLE; + ex_style = WS_EX_TOOLWINDOW; top_height = 0; } RECT rect = {x, y, x+STARTMENU_WIDTH_MIN, y+top_height}; // start height before adding an menu button - AdjustWindowRect(&rect, style, FALSE); + AdjustWindowRectEx(&rect, style, FALSE, ex_style); StartMenuCreateInfo create_info; @@ -109,7 +111,7 @@ HWND StartMenu::Create(int x, int y, const StartMenuFolders& folders, HWND hwndP if (title) create_info._title = title; - HWND hwnd = Window::Create(creator, &create_info, 0, GetWndClasss(), title, + HWND hwnd = Window::Create(creator, &create_info, ex_style, GetWndClasss(), title, style, rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top, hwndParent); // make sure the window is not off the screen @@ -240,7 +242,7 @@ LRESULT StartMenu::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam) WindowRect pos(_hwnd); //TODO: do something similar to StartMenuRoot::TrackStartmenu() in order to automatically close submenus when clicking on the desktop background - StartMenu::Create(pos.left, pos.top, _create_info._folders, 0, _create_info._title, _create_info._creator); + StartMenu::Create(pos.left+3, pos.bottom-3, _create_info._folders, 0, _create_info._title, _create_info._creator); CloseStartMenu(); } break;}