Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-13 14:20:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

[EXPLORER] 'Show Desktop' button should work on button up (#4718)

Browse source 
Follow-up of PR #4715. CORE-15369
- The 'Show Desktop' button of taskbar works on button up instead of button down.
- Add NULL checks for m_ShowDesktopButton.
- Fix hung-up in rebooting.
This commit is contained in:
Katayama Hirofumi MZ 2022-09-22 23:01:12 +09:00 committed by GitHub
parent 26efda4d8d
commit ba2cead8a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
base/shell/explorer/traywnd.cpp
View file

@ -310,7 +310,7 @@ public:
return 0; return 0;
// Show/Hide Desktop // Show/Hide Desktop
::SendMessageW(::GetParent(m_hWnd), WM_COMMAND, TRAYCMD_TOGGLE_DESKTOP, 0); GetParent().SendMessage(WM_COMMAND, TRAYCMD_TOGGLE_DESKTOP, 0);
return 0; return 0;
} }
@ -324,7 +324,7 @@ public:
PostMessage(TSDB_CLICK, 0, 0); PostMessage(TSDB_CLICK, 0, 0);
} }
LRESULT OnLButtonDown(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) LRESULT OnLButtonUp(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
{ {
Click(); // Left-click Click(); // Left-click
return 0; return 0;
@ -357,6 +357,8 @@ public:
BOOL PtInButton(POINT pt) BOOL PtInButton(POINT pt)
{ {
if (!IsWindow())
return FALSE;
RECT rc; RECT rc;
GetWindowRect(&rc); GetWindowRect(&rc);
INT cxEdge = ::GetSystemMetrics(SM_CXEDGE), cyEdge = ::GetSystemMetrics(SM_CYEDGE); INT cxEdge = ::GetSystemMetrics(SM_CXEDGE), cyEdge = ::GetSystemMetrics(SM_CYEDGE);
@ -375,7 +377,7 @@ public:
m_bHovering = TRUE; m_bHovering = TRUE;
SetTimer(SHOW_DESKTOP_TIMER_ID, SHOW_DESKTOP_TIMER_INTERVAL, NULL); SetTimer(SHOW_DESKTOP_TIMER_ID, SHOW_DESKTOP_TIMER_INTERVAL, NULL);
InvalidateRect(NULL, TRUE); InvalidateRect(NULL, TRUE);
::SendMessageW(::GetParent(m_hWnd), WM_NCPAINT, 0, 0); GetParent().PostMessage(WM_NCPAINT, 0, 0);
} }
LRESULT OnMouseMove(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) LRESULT OnMouseMove(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
@ -396,7 +398,7 @@ public:
m_bHovering = FALSE; m_bHovering = FALSE;
KillTimer(SHOW_DESKTOP_TIMER_ID); KillTimer(SHOW_DESKTOP_TIMER_ID);
InvalidateRect(NULL, TRUE); InvalidateRect(NULL, TRUE);
::SendMessageW(::GetParent(m_hWnd), WM_NCPAINT, 0, 0); GetParent().PostMessage(WM_NCPAINT, 0, 0);
} }
return 0; return 0;
@ -413,7 +415,7 @@ public:
} }
BEGIN_MSG_MAP(CTrayShowDesktopButton) BEGIN_MSG_MAP(CTrayShowDesktopButton)
MESSAGE_HANDLER(WM_LBUTTONDOWN, OnLButtonDown) MESSAGE_HANDLER(WM_LBUTTONUP, OnLButtonUp)
MESSAGE_HANDLER(WM_SETTINGCHANGE, OnSettingChanged) MESSAGE_HANDLER(WM_SETTINGCHANGE, OnSettingChanged)
MESSAGE_HANDLER(WM_THEMECHANGED, OnSettingChanged) MESSAGE_HANDLER(WM_THEMECHANGED, OnSettingChanged)
MESSAGE_HANDLER(WM_PAINT, OnPaint) MESSAGE_HANDLER(WM_PAINT, OnPaint)
@ -2605,13 +2607,15 @@ ChangePos:
// We have to draw non-client area because the 'Show Desktop' button is beyond client area. // We have to draw non-client area because the 'Show Desktop' button is beyond client area.
void DrawShowDesktopButton() void DrawShowDesktopButton()
{ {
if (!m_ShowDesktopButton.IsWindow())
return;
// Get the rectangle in window coordinates // Get the rectangle in window coordinates
RECT rcButton, rcWnd; RECT rcButton, rcWnd;
GetWindowRect(&rcWnd); GetWindowRect(&rcWnd);
m_ShowDesktopButton.GetWindowRect(&rcButton); m_ShowDesktopButton.GetWindowRect(&rcButton);
::OffsetRect(&rcButton, -rcWnd.left, -rcWnd.top); ::OffsetRect(&rcButton, -rcWnd.left, -rcWnd.top);
HDC hdc = GetDCEx(NULL, DCX_WINDOW | DCX_CACHE | DCX_NORESETATTRS); HDC hdc = GetDCEx(NULL, DCX_WINDOW | DCX_CACHE);
m_ShowDesktopButton.OnDraw(hdc, &rcButton); // Draw the button m_ShowDesktopButton.OnDraw(hdc, &rcButton); // Draw the button
ReleaseDC(hdc); ReleaseDC(hdc);
} }
@ -3232,10 +3236,10 @@ HandleTrayContextMenu:
LRESULT OnNcActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) LRESULT OnNcActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
{ {
DefWindowProc(uMsg, wParam, lParam); LRESULT ret = DefWindowProc(uMsg, wParam, lParam);
DrawShowDesktopButton(); // We have to draw non-client area DrawShowDesktopButton(); // We have to draw non-client area
bHandled = TRUE; bHandled = TRUE;
return 0; return ret;
} }
LRESULT OnNcCalcSize(INT code, WPARAM wParam, LPARAM lParam, BOOL& bHandled) LRESULT OnNcCalcSize(INT code, WPARAM wParam, LPARAM lParam, BOOL& bHandled)