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

fix a few taskbar context menu bugs including Bugzilla entry 720

Browse source 
svn path=/trunk/; revision=18516
This commit is contained in:
Martin Fuchs 2005-10-17 12:41:52 +00:00
parent d3618b8394
commit 47110fba6f
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
reactos/subsys/system/explorer/taskbar/taskbar.cpp
View file

@ -194,7 +194,7 @@ LRESULT TaskBar::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam)
Point pt(lparam); Point pt(lparam);
ScreenToClient(_htoolbar, &pt); ScreenToClient(_htoolbar, &pt);
if ((HWND)wparam==_htoolbar && SendMessage(_htoolbar, TB_HITTEST, 0, (LPARAM)&pt)>0) if ((HWND)wparam==_htoolbar && SendMessage(_htoolbar, TB_HITTEST, 0, (LPARAM)&pt)>=0)
break; // avoid displaying context menu for application button _and_ desktop bar at the same time break; // avoid displaying context menu for application button _and_ desktop bar at the same time
goto def;} goto def;}
@ -258,7 +258,7 @@ int TaskBar::Notify(int id, NMHDR* pnmh)
(it=_map.find_id(btninfo.idCommand))!=_map.end()) { (it=_map.find_id(btninfo.idCommand))!=_map.end()) {
//TaskBarEntry& entry = it->second; //TaskBarEntry& entry = it->second;
ActivateApp(it, false); ActivateApp(it, false, false); // don't restore minimized windows on right button click
#ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003) #ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003)
static DynamicFct<DWORD(STDAPICALLTYPE*)(RESTRICTIONS)> pSHRestricted(TEXT("SHELL32"), "SHRestricted"); static DynamicFct<DWORD(STDAPICALLTYPE*)(RESTRICTIONS)> pSHRestricted(TEXT("SHELL32"), "SHRestricted");
@ -277,7 +277,7 @@ int TaskBar::Notify(int id, NMHDR* pnmh)
} }
void TaskBar::ActivateApp(TaskBarMap::iterator it, bool can_minimize) void TaskBar::ActivateApp(TaskBarMap::iterator it, bool can_minimize, bool can_restore)
{ {
HWND hwnd = it->first; HWND hwnd = it->first;
@ -285,7 +285,7 @@ void TaskBar::ActivateApp(TaskBarMap::iterator it, bool can_minimize)
(hwnd==GetForegroundWindow() || hwnd==_last_foreground_wnd); (hwnd==GetForegroundWindow() || hwnd==_last_foreground_wnd);
// switch to selected application window // switch to selected application window
if (!minimize_it) if (can_restore && !minimize_it)
if (IsIconic(hwnd)) if (IsIconic(hwnd))
PostMessage(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0); PostMessage(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0);
@ -312,8 +312,10 @@ void TaskBar::ShowAppSystemMenu(TaskBarMap::iterator it)
GetCursorPos(&pt); GetCursorPos(&pt);
int cmd = TrackPopupMenu(hmenu, TPM_LEFTBUTTON|TPM_RIGHTBUTTON|TPM_RETURNCMD, pt.x, pt.y, 0, _hwnd, NULL); int cmd = TrackPopupMenu(hmenu, TPM_LEFTBUTTON|TPM_RIGHTBUTTON|TPM_RETURNCMD, pt.x, pt.y, 0, _hwnd, NULL);
if (cmd) if (cmd) {
ActivateApp(it, false, false); // reactivate window after the context menu has closed
PostMessage(it->first, WM_SYSCOMMAND, cmd, 0); PostMessage(it->first, WM_SYSCOMMAND, cmd, 0);
}
} }
} }

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

@ -94,7 +94,7 @@ protected:
int Command(int id, int code); int Command(int id, int code);
int Notify(int id, NMHDR* pnmh); int Notify(int id, NMHDR* pnmh);
void ActivateApp(TaskBarMap::iterator it, bool can_minimize=true); void ActivateApp(TaskBarMap::iterator it, bool can_minimize=true, bool can_restore=true);
void ShowAppSystemMenu(TaskBarMap::iterator it); void ShowAppSystemMenu(TaskBarMap::iterator it);
static BOOL CALLBACK EnumWndProc(HWND hwnd, LPARAM lparam); static BOOL CALLBACK EnumWndProc(HWND hwnd, LPARAM lparam);