Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 13:26:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32] Fix focus glitch when hovering separators with submenu open (#7932)

Browse source 
CORE-20124

Since `TB_HITTEST` returns negative numbers for ID for separator menu items [^1],
shell menu assumes mouse moved outside of the menu popup, highlighting the menu
item for currently open submenu.
To fix this behavior, we can detect separators in `CMenuFocusManager::ProcessMouseMove`
and negate the ID returned by `TB_HITTEST` to make it a positive number again,
so the shell menu wouldn't glitch.

[^1]: https://learn.microsoft.com/en-us/windows/win32/controls/tb-hittest
This commit is contained in:
Mohammad Amin Mollazadeh 2025-05-04 18:41:44 +03:30 • committed by GitHub
parent 3e342246d4
commit cc16769179
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

17
dll/win32/shell32/shellmenu/CMenuFocusManager.cpp
View file

@ -348,6 +348,23 @@ LRESULT CMenuFocusManager::ProcessMouseMove(MSG* msg)
iHitTestResult = SendMessageW(child, TB_HITTEST, 0, (LPARAM) &pt); iHitTestResult = SendMessageW(child, TB_HITTEST, 0, (LPARAM) &pt);
isTracking = entry->mb->_IsTracking(); isTracking = entry->mb->_IsTracking();
if (iHitTestResult < -1)
{
// TB_HITTEST would return negative numbers for separators
iHitTestResult = -iHitTestResult;
}
else if (iHitTestResult == -1)
{
// TB_HITTEST would return -1 in two cases:
// 1. the mouse is outside the toolbar;
// 2. the mouse is over the first item, and that item is a separator.
// Confirm the second scenario by checking first item's rect.
RECT rc;
SendMessageW(child, TB_GETITEMRECT, 1, (LPARAM)&rc);
if (PtInRect(&rc, pt))
iHitTestResult = 1;
}
if (SendMessage(child, WM_USER_ISTRACKEDITEM, iHitTestResult, 0) == S_FALSE) if (SendMessage(child, WM_USER_ISTRACKEDITEM, iHitTestResult, 0) == S_FALSE)
{ {
// The current tracked item has changed, notify the toolbar // The current tracked item has changed, notify the toolbar