Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

prepare hidden startmenu to enhance responsivness

Browse source 
svn path=/trunk/; revision=7551
This commit is contained in:
Martin Fuchs 2004-01-10 17:08:31 +00:00
parent e7e924134c
commit 877d88090f
4 changed files with 49 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
reactos/subsys/system/explorer/taskbar/desktopbar.cpp
View file

@ -104,6 +104,9 @@ LRESULT DesktopBar::Init(LPCREATESTRUCT pcs)
// notify all top level windows about the successfully created desktop bar
PostMessage(HWND_BROADCAST, WM_TASKBARCREATED, 0, 0);
// prepare Startmenu, but hide it for now
_startMenuRoot = GET_WINDOW(StartMenuRoot, StartMenuRoot::Create(_hwnd));
return 0;
}
@ -213,11 +216,8 @@ int DesktopBar::Command(int id, int code)
void DesktopBar::ShowStartMenu()
{
// create Startmenu
StartMenuRoot* startMenuRoot = GET_WINDOW(StartMenuRoot, StartMenuRoot::Create(_hwnd));
if (startMenuRoot)
startMenuRoot->TrackStartmenu();
if (_startMenuRoot)
_startMenuRoot->TrackStartmenu();
}

2
reactos/subsys/system/explorer/taskbar/desktopbar.h
View file

@ -91,4 +91,6 @@ protected:
WindowHandle _hwndTaskBar;
WindowHandle _hwndNotify;
WindowHandle _hwndQuickLaunch;
struct StartMenuRoot* _startMenuRoot;
};

46
reactos/subsys/system/explorer/taskbar/startmenu.cpp
View file

@ -345,7 +345,7 @@ LRESULT StartMenu::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam)
// route message to the parent menu and close menus after launching an entry
if (!SendParent(nmsg, wparam, lparam))
DestroyWindow(_hwnd);
CloseStartMenu();
return 1; // signal that we have received and processed the message
case PM_STARTMENU_CLOSED:
@ -657,7 +657,7 @@ int StartMenu::Command(int id, int code)
{
switch(id) {
case IDCANCEL:
DestroyWindow(_hwnd);
CloseStartMenu(id);
break;
default: {
@ -907,12 +907,30 @@ void StartMenu::ActivateEntry(int id, const ShellEntrySet& entries)
// If the entry is no subdirectory, there can only be one shell entry.
assert(entries.size()==1);
entry->launch_entry(_hwnd); ///@todo launch in the background; specify correct HWND for error message box titles
HWND hparent = GetParent(_hwnd);
ShellPath shell_path = entry->create_absolute_pidl();
// close start menus after launching the selected entry
CloseStartMenu(id);
// we deleted 'this' - ensure we leave loop and function
///@todo launch in the background; specify correct HWND for error message box titles
SHELLEXECUTEINFO shexinfo;
shexinfo.cbSize = sizeof(SHELLEXECUTEINFO);
shexinfo.fMask = SEE_MASK_INVOKEIDLIST; // SEE_MASK_IDLIST is also possible.
shexinfo.hwnd = hparent;
shexinfo.lpVerb = NULL;
shexinfo.lpFile = NULL;
shexinfo.lpParameters = NULL;
shexinfo.lpDirectory = NULL;
shexinfo.nShow = SW_SHOWNORMAL;
shexinfo.lpIDList = &*shell_path;
if (!ShellExecuteEx(&shexinfo))
display_error(hparent, GetLastError());
// we may have deleted 'this' - ensure we leave the loop and function
return;
}
}
@ -1137,7 +1155,7 @@ HWND StartMenuRoot::Create(HWND hwndDesktopBar)
AdjustWindowRectEx(&rect, WS_POPUP|WS_THICKFRAME|WS_CLIPCHILDREN|WS_VISIBLE, FALSE, 0);
return Window::Create(WINDOW_CREATOR(StartMenuRoot), 0, GetWndClasss(), TITLE_STARTMENU,
WS_POPUP|WS_THICKFRAME|WS_CLIPCHILDREN|WS_VISIBLE,
WS_POPUP|WS_THICKFRAME|WS_CLIPCHILDREN,
rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top, hwndDesktopBar);
}
@ -1147,6 +1165,13 @@ void StartMenuRoot::TrackStartmenu()
MSG msg;
HWND hwnd = _hwnd;
#ifdef _LIGHT_STARTMENU
_selected_id = -1;
#endif
// show previously hidden start menu
ShowWindow(hwnd, SW_SHOW);
while(IsWindow(hwnd)) {
if (!GetMessage(&msg, 0, 0, 0)) {
PostQuitMessage(msg.wParam);
@ -1165,7 +1190,7 @@ void StartMenuRoot::TrackStartmenu()
}
if (!menu_wnd) {
DestroyWindow(_hwnd);
CloseStartMenu();
break;
}
}
@ -1344,6 +1369,15 @@ void StartMenuRoot::Paint(PaintCanvas& canvas)
}
void StartMenuRoot::CloseStartMenu(int id)
{
if (_submenu)
CloseSubmenus();
ShowWindow(_hwnd, SW_HIDE);
}
int StartMenuHandler::Command(int id, int code)
{
switch(id) {

9
reactos/subsys/system/explorer/taskbar/startmenu.h
View file

@ -275,7 +275,7 @@ protected:
void CreateSubmenu(int id, int folder1, int folder2, LPCTSTR title, CREATORFUNC creator=s_def_creator);
void CreateSubmenu(int id, const StartMenuFolders& new_folders, LPCTSTR title, CREATORFUNC creator=s_def_creator);
void ActivateEntry(int id, const ShellEntrySet& entries);
void CloseStartMenu(int id=0);
virtual void CloseStartMenu(int id=0);
bool GetButtonRect(int id, PRECT prect) const;
@ -351,6 +351,7 @@ protected:
void AddEntries();
void Paint(PaintCanvas& canvas);
void CloseStartMenu(int id=0);
};
@ -364,8 +365,6 @@ struct SettingsMenu : public StartMenuHandler
{
}
void TrackStartmenu();
protected:
void AddEntries();
};
@ -381,8 +380,6 @@ struct BrowseMenu : public StartMenuHandler
{
}
void TrackStartmenu();
protected:
void AddEntries();
};
@ -398,8 +395,6 @@ struct SearchMenu : public StartMenuHandler
{
}
void TrackStartmenu();
protected:
void AddEntries();
};