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

[RSHELL]

Browse source 
* Redesigned large portions of the focus manager. All the mouse interactions seem to work now
CORE-7586.

svn path=/branches/shell-experiments/; revision=62567
This commit is contained in:
David Quintana 2014-03-26 11:33:52 +00:00
parent d2b33acd15
commit 8676a39ebc
7 changed files with 404 additions and 278 deletions
Download patch file Download diff file Expand all files Collapse all files

50
base/shell/rshell/CMenuFocusManager.h
View file

@ -30,6 +30,22 @@ private:
static CMenuFocusManager * GetManager();
enum StackEntryType
{
NoEntry,
MenuBarEntry,
MenuPopupEntry,
TrackedMenuEntry
};
struct StackEntry
{
StackEntryType type;
CMenuBand * mb;
HMENU hmenu;
HWND hwnd;
};
public:
static CMenuFocusManager * AcquireManager();
@ -40,26 +56,29 @@ private:
static LRESULT CALLBACK s_GetMsgHook(INT nCode, WPARAM wParam, LPARAM lParam);
private:
CMenuBand * m_currentBand;
HWND m_currentFocus;
HMENU m_currentMenu;
HWND m_parentToolbar;
StackEntry * m_current;
StackEntry * m_parent;
HHOOK m_hMsgFilterHook;
HHOOK m_hGetMsgHook;
DWORD m_threadId;
BOOL m_mouseTrackDisabled;
WPARAM m_lastMoveFlags;
LPARAM m_lastMovePos;
POINT m_ptPrev;
HWND m_captureHwnd;
// TODO: make dynamic
#define MAX_RECURSE 20
CMenuBand* m_bandStack[MAX_RECURSE];
StackEntry m_bandStack[MAX_RECURSE];
int m_bandCount;
HRESULT PushToArray(CMenuBand * item);
HRESULT PopFromArray(CMenuBand ** pItem);
HRESULT PeekArray(CMenuBand ** pItem);
HRESULT PushToArray(StackEntryType type, CMenuBand * mb, HMENU hmenu);
HRESULT PopFromArray(StackEntryType * pType, CMenuBand ** pMb, HMENU * pHmenu);
protected:
CMenuFocusManager();
@ -77,15 +96,18 @@ private:
LRESULT MsgFilterHook(INT nCode, WPARAM wParam, LPARAM lParam);
HRESULT PlaceHooks();
HRESULT RemoveHooks();
HRESULT UpdateFocus(CMenuBand * newBand, HMENU popupToTrack = NULL);
HRESULT UpdateFocus();
HRESULT IsTrackedWindow(HWND hWnd);
void DisableMouseTrack(HWND enableTo, BOOL disableThis);
void DisableMouseTrack(HWND parent, BOOL disableThis);
void SetCapture(HWND child);
LRESULT ProcessMouseMove(MSG* msg);
public:
HRESULT PushMenu(CMenuBand * mb);
HRESULT PopMenu(CMenuBand * mb);
HRESULT PushTrackedPopup(CMenuBand * mb, HMENU popup);
HRESULT PopTrackedPopup(CMenuBand * mb, HMENU popup);
HRESULT PushMenuBar(CMenuBand * mb);
HRESULT PushMenuPopup(CMenuBand * mb);
HRESULT PushTrackedPopup(HMENU popup);
HRESULT PopMenuBar(CMenuBand * mb);
HRESULT PopMenuPopup(CMenuBand * mb);
HRESULT PopTrackedPopup(HMENU popup);
};