Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-22 18:00:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

[RSHELL]

Browse source 
* Some code improvements, refactoring, and commenting.
* Using alternative method of handling hot-tracking, which does not break in win2003.
CORE-7586

svn path=/branches/shell-experiments/; revision=62681
This commit is contained in:
David Quintana 2014-04-07 18:41:47 +00:00
parent c46d671641
commit c21f759be0
5 changed files with 302 additions and 310 deletions
Download patch file Download diff file Expand all files Collapse all files

21
base/shell/rshell/CMenuFocusManager.cpp
View file

@ -261,7 +261,7 @@ LRESULT CMenuFocusManager::ProcessMouseMove(MSG* msg)
// Don't do anything if another window is capturing the mouse.
HWND cCapture = ::GetCapture();
if (cCapture && cCapture != m_captureHwnd)
if (cCapture && cCapture != m_captureHwnd && m_current->type != TrackedMenuEntry)
return TRUE;
m_ptPrev = pt;
@ -283,7 +283,8 @@ LRESULT CMenuFocusManager::ProcessMouseMove(MSG* msg)
{
m_entryUnderMouse->mb->_ChangeHotItem(NULL, -1, HICF_MOUSE);
}
SetCapture(NULL);
if (cCapture == m_captureHwnd)
SetCapture(NULL);
}
}
@ -303,7 +304,8 @@ LRESULT CMenuFocusManager::ProcessMouseMove(MSG* msg)
if (m_current->type == TrackedMenuEntry)
SendMessage(entry->hwnd, WM_CANCELMODE, 0, 0);
PostMessage(child, WM_USER_CHANGETRACKEDITEM, iHitTestResult, isTracking);
return FALSE;
if (m_current->type == TrackedMenuEntry)
return FALSE;
}
}
@ -311,10 +313,10 @@ LRESULT CMenuFocusManager::ProcessMouseMove(MSG* msg)
{
if (entry)
{
SetCapture(child);
if (m_current->type == MenuPopupEntry)
{
//SetCapture(child);
ScreenToClient(child, &pt2);
SendMessage(child, WM_MOUSEMOVE, msg->wParam, MAKELPARAM(pt2.x, pt2.y));
}
@ -399,6 +401,10 @@ LRESULT CMenuFocusManager::GetMsgHook(INT nCode, WPARAM wParam, LPARAM lParam)
case WM_MOUSEMOVE:
callNext = ProcessMouseMove(msg);
break;
case WM_MOUSELEAVE:
callNext = ProcessMouseMove(msg);
//callNext = ProcessMouseLeave(msg);
break;
case WM_SYSKEYDOWN:
case WM_KEYDOWN:
if (m_current->type == MenuPopupEntry)
@ -406,16 +412,17 @@ LRESULT CMenuFocusManager::GetMsgHook(INT nCode, WPARAM wParam, LPARAM lParam)
DisableMouseTrack(m_current->hwnd, TRUE);
switch (msg->wParam)
{
case VK_ESCAPE:
case VK_MENU:
case VK_LMENU:
case VK_RMENU:
m_current->mb->_MenuItemHotTrack(MPOS_FULLCANCEL);
break;
case VK_LEFT:
m_current->mb->_MenuItemHotTrack(MPOS_SELECTLEFT);
m_current->mb->_MenuItemHotTrack(VK_LEFT);
break;
case VK_RIGHT:
m_current->mb->_MenuItemHotTrack(MPOS_SELECTRIGHT);
m_current->mb->_MenuItemHotTrack(VK_RIGHT);
break;
case VK_UP:
m_current->mb->_MenuItemHotTrack(VK_UP);