#include <windowsx.h>
#include <shlwapi_undoc.h>
-WINE_DEFAULT_DEBUG_CHANNEL(CMenuBand);
-
#define TBSTYLE_EX_VERTICAL 4
+WINE_DEFAULT_DEBUG_CHANNEL(CMenuBand);
+
#define TIMERID_HOTTRACK 1
#define SUBCLASS_ID_MENUBAND 1
class CMenuToolbarBase
{
+protected:
+ CMenuBand * m_menuBand;
+ HWND m_hwnd;
+ DWORD m_dwMenuFlags;
+ INT m_hotItem;
+ WNDPROC m_SubclassOld;
+
+private:
+ static LRESULT CALLBACK s_SubclassProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
+
public:
CMenuToolbarBase(CMenuBand *menuBand);
virtual ~CMenuToolbarBase() {}
+ HRESULT IsWindowOwner(HWND hwnd);
HRESULT CreateToolbar(HWND hwndParent, DWORD dwFlags);
HRESULT GetWindow(HWND *phwnd);
HRESULT ShowWindow(BOOL fShow);
HRESULT Close();
- BOOL IsWindowOwner(HWND hwnd) { return m_hwnd && m_hwnd == hwnd; }
-
virtual HRESULT FillToolbar() = 0;
virtual HRESULT PopupItem(UINT uItem) = 0;
virtual HRESULT HasSubMenu(UINT uItem) = 0;
- virtual HRESULT OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult);
virtual HRESULT OnContextMenu(NMMOUSE * rclick) = 0;
-
- HRESULT OnHotItemChange(const NMTBHOTITEM * hot);
+ virtual HRESULT OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult);
HRESULT PopupSubMenu(UINT index, IShellMenu* childShellMenu);
HRESULT PopupSubMenu(UINT index, HMENU menu);
HRESULT DoContextMenu(IContextMenu* contextMenu);
- static LRESULT CALLBACK s_SubclassProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
-protected:
-
- static const UINT WM_USER_SHOWPOPUPMENU = WM_USER + 1;
+ HRESULT ChangeHotItem(DWORD changeType);
+ HRESULT OnHotItemChange(const NMTBHOTITEM * hot);
+protected:
LRESULT CALLBACK SubclassProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
-
- CMenuBand *m_menuBand;
- HWND m_hwnd;
- DWORD m_dwMenuFlags;
- INT m_hotItem;
- WNDPROC m_SubclassOld;
};
-class CMenuStaticToolbar : public CMenuToolbarBase
+class CMenuStaticToolbar :
+ public CMenuToolbarBase
{
+private:
+ HMENU m_hmenu;
+
public:
CMenuStaticToolbar(CMenuBand *menuBand);
virtual ~CMenuStaticToolbar() {}
virtual HRESULT OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult);
virtual HRESULT OnContextMenu(NMMOUSE * rclick);
-private:
- HMENU m_hmenu;
};
-class CMenuSFToolbar : public CMenuToolbarBase
+class CMenuSFToolbar :
+ public CMenuToolbarBase
{
+private:
+ IShellFolder * m_shellFolder;
+ LPCITEMIDLIST m_idList;
+ HKEY m_hKey;
+
public:
CMenuSFToolbar(CMenuBand *menuBand);
virtual ~CMenuSFToolbar();
virtual HRESULT OnContextMenu(NMMOUSE * rclick);
private:
- LPITEMIDLIST GetPidlFromId(UINT uItem, INT* pIndex);
-
- IShellFolder * m_shellFolder;
- LPCITEMIDLIST m_idList;
- HKEY m_hKey;
+ LPITEMIDLIST GetPidlFromId(UINT uItem, INT* pIndex = NULL);
};
class CMenuBand :
public IWinEventHandler,
public IShellMenuAcc
{
-public:
- CMenuBand();
- ~CMenuBand();
-
private:
- IOleWindow *m_site;
- IShellMenuCallback *m_psmc;
+ CMenuFocusManager * m_focusManager;
+ CMenuStaticToolbar * m_staticToolbar;
+ CMenuSFToolbar * m_SFToolbar;
- CMenuStaticToolbar *m_staticToolbar;
- CMenuSFToolbar *m_SFToolbar;
+ CComPtr<IOleWindow> m_site;
+ CComPtr<IShellMenuCallback> m_psmc;
+ CComPtr<IMenuPopup> m_subMenuChild;
+ CComPtr<IMenuPopup> m_subMenuParent;
- UINT m_uId;
- UINT m_uIdAncestor;
+ UINT m_uId;
+ UINT m_uIdAncestor;
DWORD m_dwFlags;
PVOID m_UserData;
HMENU m_hmenu;
- HWND m_menuOwner;
+ HWND m_menuOwner;
BOOL m_useBigIcons;
-
HWND m_topLevelWindow;
-
- CMenuFocusManager * m_focusManager;
+
+ CMenuToolbarBase * m_hotBar;
+ INT m_hotItem;
public:
+ CMenuBand();
+ ~CMenuBand();
+
+ DECLARE_NOT_AGGREGATABLE(CMenuBand)
+ DECLARE_PROTECT_FINAL_CONSTRUCT()
+
+ BEGIN_COM_MAP(CMenuBand)
+ COM_INTERFACE_ENTRY_IID(IID_IDeskBar, IMenuPopup)
+ COM_INTERFACE_ENTRY_IID(IID_IShellMenu, IShellMenu)
+ COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget)
+ COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IDeskBand)
+ COM_INTERFACE_ENTRY_IID(IID_IDockingWindow, IDockingWindow)
+ COM_INTERFACE_ENTRY_IID(IID_IDeskBand, IDeskBand)
+ COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite)
+ COM_INTERFACE_ENTRY_IID(IID_IInputObject, IInputObject)
+ COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream)
+ COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersistStream)
+ COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider)
+ COM_INTERFACE_ENTRY_IID(IID_IMenuPopup, IMenuPopup)
+ COM_INTERFACE_ENTRY_IID(IID_IMenuBand, IMenuBand)
+ COM_INTERFACE_ENTRY_IID(IID_IShellMenu2, IShellMenu2)
+ COM_INTERFACE_ENTRY_IID(IID_IWinEventHandler, IWinEventHandler)
+ COM_INTERFACE_ENTRY_IID(IID_IShellMenuAcc, IShellMenuAcc)
+ END_COM_MAP()
// *** IDeskBand methods ***
virtual HRESULT STDMETHODCALLTYPE GetBandInfo(DWORD dwBandID, DWORD dwViewMode, DESKBANDINFO *pdbi);
virtual HRESULT STDMETHODCALLTYPE DoDefaultAction(THIS);
virtual HRESULT STDMETHODCALLTYPE IsEmpty(THIS);
- HRESULT CallCBWithId(UINT Id, UINT uMsg, WPARAM wParam, LPARAM lParam);
- HRESULT CallCBWithPidl(LPITEMIDLIST pidl, UINT uMsg, WPARAM wParam, LPARAM lParam);
- HRESULT TrackPopup(HMENU popup, INT x, INT y);
- HRESULT GetTopLevelWindow(HWND*topLevel);
+ HRESULT _CallCBWithItemId(UINT Id, UINT uMsg, WPARAM wParam, LPARAM lParam);
+ HRESULT _CallCBWithItemPidl(LPITEMIDLIST pidl, UINT uMsg, WPARAM wParam, LPARAM lParam);
+ HRESULT _TrackSubMenuUsingTrackPopupMenu(HMENU popup, INT x, INT y);
+ HRESULT _GetTopLevelWindow(HWND*topLevel);
+ HRESULT _OnHotItemChanged(CMenuToolbarBase * tb, INT id);
+ HRESULT _MenuItemHotTrack(DWORD changeType);
+ HRESULT _OnPopupSubMenu(IMenuPopup * popup, POINTL * pAt, RECTL * pExclude);
- BOOL UseBigIcons() {
+ BOOL UseBigIcons()
+ {
return m_useBigIcons;
}
- DECLARE_NOT_AGGREGATABLE(CMenuBand)
- DECLARE_PROTECT_FINAL_CONSTRUCT()
-
- BEGIN_COM_MAP(CMenuBand)
- COM_INTERFACE_ENTRY_IID(IID_IDeskBar, IMenuPopup)
- COM_INTERFACE_ENTRY_IID(IID_IShellMenu, IShellMenu)
- COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget)
- COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IDeskBand)
- COM_INTERFACE_ENTRY_IID(IID_IDockingWindow, IDockingWindow)
- COM_INTERFACE_ENTRY_IID(IID_IDeskBand, IDeskBand)
- COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite)
- COM_INTERFACE_ENTRY_IID(IID_IInputObject, IInputObject)
- COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream)
- COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersistStream)
- COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider)
- COM_INTERFACE_ENTRY_IID(IID_IMenuPopup, IMenuPopup)
- COM_INTERFACE_ENTRY_IID(IID_IMenuBand, IMenuBand)
- COM_INTERFACE_ENTRY_IID(IID_IShellMenu2, IShellMenu2)
- COM_INTERFACE_ENTRY_IID(IID_IWinEventHandler, IWinEventHandler)
- COM_INTERFACE_ENTRY_IID(IID_IShellMenuAcc, IShellMenuAcc)
- END_COM_MAP()
-
private:
HRESULT _CallCB(UINT uMsg, WPARAM wParam, LPARAM lParam, UINT id = 0, LPITEMIDLIST pidl = NULL);
};
}
private:
+ CMenuBand * m_currentBand;
+ HWND m_currentFocus;
+ HHOOK m_hHook;
+ DWORD m_threadId;
+
// TODO: make dynamic
-#define MAX_RECURSE 100
+#define MAX_RECURSE 20
CMenuBand* m_bandStack[MAX_RECURSE];
int m_bandCount;
if (pItem)
*pItem = m_bandStack[m_bandCount];
+ m_bandStack[m_bandCount] = NULL;
+
return S_OK;
}
BEGIN_COM_MAP(CMenuFocusManager)
END_COM_MAP()
-private:
- CMenuBand * m_currentBand;
- HWND m_currentFocus;
- HHOOK m_hHook;
- DWORD m_threadId;
-
LRESULT GetMsgHook(INT nCode, WPARAM wParam, LPARAM lParam)
{
if (nCode < 0)
return CallNextHookEx(m_hHook, nCode, wParam, lParam);
- BOOL callNext = TRUE;
- BOOL fRemoved = wParam;
- MSG* msg = reinterpret_cast<MSG*>(lParam);
-
if (nCode == HC_ACTION)
{
+ BOOL callNext = TRUE;
+ MSG* msg = reinterpret_cast<MSG*>(lParam);
+
// Do whatever is necessary here
switch (msg->message)
case VK_MENU:
case VK_LMENU:
case VK_RMENU:
- m_currentBand->OnSelect(MPOS_FULLCANCEL);
+ m_currentBand->_MenuItemHotTrack(MPOS_FULLCANCEL);
break;
case VK_LEFT:
- m_currentBand->OnSelect(MPOS_SELECTLEFT);
+ m_currentBand->_MenuItemHotTrack(MPOS_SELECTLEFT);
break;
case VK_RIGHT:
- m_currentBand->OnSelect(MPOS_SELECTRIGHT);
+ m_currentBand->_MenuItemHotTrack(MPOS_SELECTRIGHT);
break;
case VK_UP:
- //m_currentBand->ChildTrack(VK_UP);
+ m_currentBand->_MenuItemHotTrack(VK_UP);
break;
case VK_DOWN:
- //m_currentBand->ChildTrack(VK_DOWN);
+ m_currentBand->_MenuItemHotTrack(VK_DOWN);
break;
}
break;
// PostMessage(m_currentFocus, WM_SYSCHAR, wParam, lParam);
//}
break;
- case WM_ACTIVATE:
- break;
-
}
if (!callNext)
HRESULT UpdateFocus(CMenuBand * newBand)
{
HRESULT hr;
+ HWND newFocus;
- hr = RemoveHooks(m_currentFocus);
-
- if (FAILED(hr) || !newBand)
+ if (newBand == NULL)
{
+ hr = RemoveHooks(m_currentFocus);
m_currentFocus = NULL;
m_currentBand = NULL;
return S_OK;
}
- HWND newFocus;
- hr = newBand->GetTopLevelWindow(&newFocus);
+ hr = newBand->_GetTopLevelWindow(&newFocus);
if (FAILED(hr))
return hr;
- hr = PlaceHooks(m_currentFocus);
- if (FAILED(hr))
- return hr;
+ if (!m_currentBand)
+ {
+ hr = PlaceHooks(newFocus);
+ if (FAILED(hr))
+ return hr;
+ }
m_currentFocus = newFocus;
m_currentBand = newBand;
{
}
+HRESULT CMenuToolbarBase::IsWindowOwner(HWND hwnd)
+{
+ return (m_hwnd && m_hwnd == hwnd) ? S_OK : S_FALSE;
+}
+
HRESULT CMenuToolbarBase::ShowWindow(BOOL fShow)
{
::ShowWindow(m_hwnd, fShow ? SW_SHOW : SW_HIDE);
case WM_TIMER:
if (wParam == TIMERID_HOTTRACK)
{
- PopupItem(m_hotItem);
KillTimer(hWnd, TIMERID_HOTTRACK);
+
+ m_menuBand->_OnPopupSubMenu(NULL, NULL, NULL);
+
+ if (HasSubMenu(m_hotItem) == S_OK)
+ {
+ PopupItem(m_hotItem);
+ }
}
}
if (hot->dwFlags & HICF_LEAVING)
{
KillTimer(m_hwnd, TIMERID_HOTTRACK);
+ m_hotItem = -1;
+ m_menuBand->_OnHotItemChanged(NULL, -1);
+ m_menuBand->_MenuItemHotTrack(MPOS_CHILDTRACKING);
}
else if (m_hotItem != hot->idNew)
{
- if (HasSubMenu(hot->idNew) == S_OK)
- {
- DWORD elapsed = 0;
- SystemParametersInfo(SPI_GETMENUSHOWDELAY, 0, &elapsed, 0);
+ DWORD elapsed = 0;
+ SystemParametersInfo(SPI_GETMENUSHOWDELAY, 0, &elapsed, 0);
+ SetTimer(m_hwnd, TIMERID_HOTTRACK, elapsed, NULL);
- m_hotItem = hot->idNew;
-
- SetTimer(m_hwnd, TIMERID_HOTTRACK, elapsed, NULL);
- }
+ m_hotItem = hot->idNew;
+ m_menuBand->_OnHotItemChanged(this, m_hotItem);
+ m_menuBand->_MenuItemHotTrack(MPOS_CHILDTRACKING);
}
-
- m_menuBand->OnSelect(MPOS_CHILDTRACKING);
return S_OK;
}
ClientToScreen(m_hwnd, &a);
ClientToScreen(m_hwnd, &b);
- POINTL pt = { b.x, b.y };
+ POINTL pt = { b.x, a.y };
RECTL rcl = { a.x, a.y, b.x, b.y }; // maybe-TODO: fetch client area of deskbar?
if (FAILED(hr))
return hr;
- popup->Popup(&pt, &rcl, MPPF_TOP | MPPF_RIGHT);
+ m_menuBand->_OnPopupSubMenu(popup, &pt, &rcl);
return S_OK;
}
HMENU popup = GetSubMenu(menu, index);
- m_menuBand->TrackPopup(popup, b.x, b.y);
+ m_menuBand->_TrackSubMenuUsingTrackPopupMenu(popup, b.x, b.y);
return S_OK;
}
HRESULT CMenuToolbarBase::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult)
{
- m_menuBand->OnSelect(MPOS_EXECUTE);
- return S_OK;
+ theResult = 0;
+ return m_menuBand->_MenuItemHotTrack(MPOS_EXECUTE);
+}
+
+
+HRESULT CMenuToolbarBase::ChangeHotItem(DWORD dwSelectType)
+{
+ int prev = m_hotItem;
+ int index = -1;
+
+ if (dwSelectType != 0xFFFFFFFF)
+ {
+ int count = SendMessage(m_hwnd, TB_BUTTONCOUNT, 0, 0);
+
+ if (m_hotItem >= 0)
+ {
+ TBBUTTONINFO info = { 0 };
+ info.cbSize = sizeof(TBBUTTONINFO);
+ info.dwMask = 0;
+ index = SendMessage(m_hwnd, TB_GETBUTTONINFO, m_hotItem, reinterpret_cast<LPARAM>(&info));
+ }
+
+ if (dwSelectType == VK_HOME)
+ {
+ index = 0;
+ dwSelectType = VK_DOWN;
+ }
+ else if (dwSelectType == VK_END)
+ {
+ index = count - 1;
+ dwSelectType = VK_UP;
+ }
+ else if (index < 0)
+ {
+ if (dwSelectType == VK_UP)
+ {
+ index = count - 1;
+ }
+ else if (dwSelectType == VK_DOWN)
+ {
+ index = 0;
+ }
+ }
+ else
+ {
+ if (dwSelectType == VK_UP)
+ {
+ index--;
+ }
+ else if (dwSelectType == VK_DOWN)
+ {
+ index++;
+ }
+ }
+
+ TBBUTTON btn = { 0 };
+ while (index >= 0 && index < count)
+ {
+ DWORD res = SendMessage(m_hwnd, TB_GETBUTTON, index, reinterpret_cast<LPARAM>(&btn));
+ if (!res)
+ return E_FAIL;
+
+ if (btn.dwData)
+ {
+ m_hotItem = btn.idCommand;
+ if (prev != m_hotItem)
+ {
+ SendMessage(m_hwnd, TB_SETHOTITEM, index, 0);
+ return m_menuBand->_OnHotItemChanged(this, m_hotItem);
+ }
+ return S_OK;
+ }
+
+ if (dwSelectType == VK_UP)
+ {
+ index--;
+ }
+ else if (dwSelectType == VK_DOWN)
+ {
+ index++;
+ }
+ }
+ }
+
+ m_hotItem = -1;
+ if (prev != m_hotItem)
+ {
+ SendMessage(m_hwnd, TB_SETHOTITEM, -1, 0);
+ m_menuBand->_OnHotItemChanged(NULL, -1);
+ }
+ return S_FALSE;
}
BOOL
SMINFO * sminfo = new SMINFO();
sminfo->dwMask = SMIM_ICON | SMIM_FLAGS;
- if (SUCCEEDED(m_menuBand->CallCBWithId(info.wID, SMC_GETINFO, 0, reinterpret_cast<LPARAM>(sminfo))))
+ if (SUCCEEDED(m_menuBand->_CallCBWithItemId(info.wID, SMC_GETINFO, 0, reinterpret_cast<LPARAM>(sminfo))))
{
tbb.iBitmap = sminfo->iIcon;
tbb.dwData = reinterpret_cast<DWORD_PTR>(sminfo);
HRESULT CMenuStaticToolbar::OnContextMenu(NMMOUSE * rclick)
{
CComPtr<IContextMenu> contextMenu;
- HRESULT hr = m_menuBand->CallCBWithId(rclick->dwItemSpec, SMC_GETOBJECT, reinterpret_cast<WPARAM>(&IID_IContextMenu), reinterpret_cast<LPARAM>(&contextMenu));
+ HRESULT hr = m_menuBand->_CallCBWithItemId(rclick->dwItemSpec, SMC_GETOBJECT, reinterpret_cast<WPARAM>(&IID_IContextMenu), reinterpret_cast<LPARAM>(&contextMenu));
if (hr != S_OK)
return hr;
HRESULT CMenuStaticToolbar::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult)
{
- HRESULT hr = m_menuBand->CallCBWithId(wParam, SMC_EXEC, 0, 0);
+ HRESULT hr;
+ hr = CMenuToolbarBase::OnCommand(wParam, lParam, theResult);
if (FAILED(hr))
return hr;
- return CMenuToolbarBase::OnCommand(wParam, lParam, theResult);
+ return m_menuBand->_CallCBWithItemId(wParam, SMC_EXEC, 0, 0);
}
HRESULT CMenuStaticToolbar::PopupItem(UINT uItem)
int index = SendMessage(m_hwnd, TB_GETBUTTONINFO, uItem, reinterpret_cast<LPARAM>(&info));
if (index < 0)
return E_FAIL;
-
+
TBBUTTON btn = { 0 };
SendMessage(m_hwnd, TB_GETBUTTON, index, reinterpret_cast<LPARAM>(&btn));
else
{
CComPtr<IShellMenu> shellMenu;
- HRESULT hr = m_menuBand->CallCBWithId(uItem, SMC_GETOBJECT, reinterpret_cast<WPARAM>(&IID_IShellMenu), reinterpret_cast<LPARAM>(&shellMenu));
+ HRESULT hr = m_menuBand->_CallCBWithItemId(uItem, SMC_GETOBJECT, reinterpret_cast<WPARAM>(&IID_IShellMenu), reinterpret_cast<LPARAM>(&shellMenu));
if (FAILED(hr))
return hr;
HRESULT CMenuSFToolbar::FillToolbar()
{
HRESULT hr;
- TBBUTTON tbb = { 0 };
int i = 0;
PWSTR MenuString;
- tbb.fsState = TBSTATE_ENABLED;
- tbb.fsStyle = 0;
-
IEnumIDList * eidl;
m_shellFolder->EnumObjects(m_hwnd, SHCONTF_FOLDERS | SHCONTF_NONFOLDERS, &eidl);
INT index = 0;
INT indexOpen = 0;
+ TBBUTTON tbb = { 0 };
+ tbb.fsState = TBSTATE_ENABLED;
+ tbb.fsStyle = 0;
+
CComPtr<IShellItem> psi;
SHCreateShellItem(NULL, m_shellFolder, item, &psi);
tbb.fsStyle |= BTNS_DROPDOWN;
}
- tbb.idCommand = i++;
+ tbb.idCommand = ++i;
tbb.iString = (INT_PTR) MenuString;
tbb.iBitmap = index;
tbb.dwData = reinterpret_cast<DWORD_PTR>(ILClone(item));
}
CoTaskMemFree(item);
+ // If no items were added, show the "empty" placeholder
+ if (i == 0)
+ {
+ TBBUTTON tbb = { 0 };
+ PWSTR MenuString = L"(Empty)";
+
+ tbb.fsState = 0/*TBSTATE_DISABLED*/;
+ tbb.fsStyle = 0;
+ tbb.iString = (INT_PTR) MenuString;
+ tbb.iBitmap = -1;
+
+ SendMessageW(m_hwnd, TB_ADDBUTTONS, 1, reinterpret_cast<LPARAM>(&tbb));
+
+ return S_OK;
+ }
+
return hr;
}
HRESULT CMenuSFToolbar::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult)
{
- return m_menuBand->CallCBWithPidl(GetPidlFromId(wParam, NULL), SMC_SFEXEC, 0, 0);
+ HRESULT hr;
+ hr = CMenuToolbarBase::OnCommand(wParam, lParam, theResult);
+ if (FAILED(hr))
+ return hr;
+
+ return m_menuBand->_CallCBWithItemPidl(GetPidlFromId(wParam), SMC_SFEXEC, 0, 0);
}
HRESULT CMenuSFToolbar::PopupItem(UINT uItem)
int index;
CComPtr<IShellMenuCallback> psmc;
CComPtr<IShellMenu> shellMenu;
-
+
LPITEMIDLIST pidl = GetPidlFromId(uItem, &index);
if (!pidl)
{
HRESULT hr;
CComPtr<IShellItem> psi;
- SHCreateShellItem(NULL, m_shellFolder, GetPidlFromId(uItem, NULL), &psi);
+ SHCreateShellItem(NULL, m_shellFolder, GetPidlFromId(uItem), &psi);
SFGAOF attrs;
hr = psi->GetAttributes(SFGAO_FOLDER, &attrs);
m_psmc(NULL),
m_staticToolbar(NULL),
m_SFToolbar(NULL),
- m_useBigIcons(FALSE)
+ m_useBigIcons(FALSE),
+ m_hotBar(NULL),
+ m_hotItem(-1),
+ m_subMenuChild(NULL)
{
m_focusManager = CMenuFocusManager::AcquireManager();
}
{
CMenuFocusManager::ReleaseManager(m_focusManager);
- if (m_site)
- m_site->Release();
-
- if (m_psmc)
- m_psmc->Release();
-
if (m_staticToolbar)
delete m_staticToolbar;
UINT uIdAncestor,
DWORD dwFlags)
{
- if (m_psmc)
- m_psmc->Release();
-
- m_psmc = psmc;
+ if (m_psmc != psmc)
+ m_psmc = psmc;
m_uId = uId;
m_uIdAncestor = uIdAncestor;
m_dwFlags = dwFlags;
if (m_psmc)
{
- m_psmc->AddRef();
-
_CallCB(SMC_CREATE, 0, reinterpret_cast<LPARAM>(&m_UserData));
}
HWND hwndParent;
HRESULT hr;
- if (m_site != NULL)
- m_site->Release();
+ m_site = NULL;
if (pUnkSite == NULL)
return S_OK;
hwndParent = NULL;
hr = pUnkSite->QueryInterface(IID_PPV_ARG(IOleWindow, &m_site));
- if (SUCCEEDED(hr))
- {
- m_site->Release();
+ if (FAILED(hr))
+ return hr;
- hr = m_site->GetWindow(&hwndParent);
- if (FAILED(hr))
- return hr;
- }
+ hr = m_site->GetWindow(&hwndParent);
+ if (FAILED(hr))
+ return hr;
if (!::IsWindow(hwndParent))
return E_FAIL;
return hr;
}
+ hr = IUnknown_QueryService(m_site, SID_SMenuPopup, IID_PPV_ARG(IMenuPopup, &m_subMenuParent));
+ if (FAILED(hr))
+ return hr;
+
CComPtr<IOleWindow> pTopLevelWindow;
hr = IUnknown_QueryService(m_site, SID_STopLevelBrowser, IID_PPV_ARG(IOleWindow, &pTopLevelWindow));
if (FAILED(hr))
if (hwndStatic) SendMessageW(hwndStatic, TB_GETIDEALSIZE, TRUE, reinterpret_cast<LPARAM>(&sizeStaticY));
if (hwndShlFld) SendMessageW(hwndShlFld, TB_GETIDEALSIZE, TRUE, reinterpret_cast<LPARAM>(&sizeShlFldY));
- int sy = max(prc->bottom - prc->top, sizeStaticY.cy + sizeShlFldY.cy);
+ int sy = min(prc->bottom - prc->top, sizeStaticY.cy + sizeShlFldY.cy);
+
+ int syStatic = sizeStaticY.cy;
+ int syShlFld = sy - syStatic;
if (hwndShlFld)
{
prc->left,
prc->top,
prc->right - prc->left,
- sizeShlFldY.cy,
+ syShlFld,
0);
DWORD btnSize = SendMessage(hwndShlFld, TB_GETBUTTONSIZE, 0, 0);
SendMessage(hwndShlFld, TB_SETBUTTONSIZE, 0, MAKELPARAM(prc->right - prc->left, HIWORD(btnSize)));
{
SetWindowPos(hwndStatic, hwndShlFld,
prc->left,
- prc->top + sizeShlFldY.cy,
+ prc->top + syShlFld,
prc->right - prc->left,
- sy - sizeShlFldY.cy,
+ syStatic,
0);
DWORD btnSize = SendMessage(hwndStatic, TB_GETBUTTONSIZE, 0, 0);
SendMessage(hwndStatic, TB_SETBUTTONSIZE, 0, MAKELPARAM(prc->right - prc->left, HIWORD(btnSize)));
pdbi->dwMask = DBIM_MINSIZE | DBIM_MAXSIZE | DBIM_INTEGRAL | DBIM_ACTUAL | DBIM_TITLE | DBIM_MODEFLAGS | DBIM_BKCOLOR;
}
+#define MIN_WIDTH 220
+
if (pdbi->dwMask & DBIM_MINSIZE)
{
SIZE sizeStatic = { 0 };
if (hwndStatic) SendMessageW(hwndStatic, TB_GETIDEALSIZE, TRUE, reinterpret_cast<LPARAM>(&sizeStatic));
if (hwndShlFld) SendMessageW(hwndShlFld, TB_GETIDEALSIZE, TRUE, reinterpret_cast<LPARAM>(&sizeShlFld));
- pdbi->ptMinSize.x = 0;
+ pdbi->ptMinSize.x = MIN_WIDTH;
pdbi->ptMinSize.y = sizeStatic.cy + sizeShlFld.cy;
}
if (pdbi->dwMask & DBIM_MAXSIZE)
if (hwndStatic) SendMessageW(hwndStatic, TB_GETMAXSIZE, 0, reinterpret_cast<LPARAM>(&sizeStatic));
if (hwndShlFld) SendMessageW(hwndShlFld, TB_GETMAXSIZE, 0, reinterpret_cast<LPARAM>(&sizeShlFld));
- pdbi->ptMaxSize.x = max(sizeStatic.cx, sizeShlFld.cx); // ignored
+ pdbi->ptMaxSize.x = max(MIN_WIDTH, max(sizeStatic.cx, sizeShlFld.cx)); // ignored
pdbi->ptMaxSize.y = sizeStatic.cy + sizeShlFld.cy;
}
if (pdbi->dwMask & DBIM_INTEGRAL)
else
hr = m_focusManager->PopMenu(this);
- return hr;
+ return S_OK;
}
HRESULT STDMETHODCALLTYPE CMenuBand::CloseDW(DWORD dwReserved)
{
HRESULT hr;
- CComPtr<IMenuPopup> pmp;
-
- hr = IUnknown_QueryService(m_site, SID_SMenuPopup, IID_PPV_ARG(IMenuPopup, &pmp));
+ hr = m_subMenuParent->SetSubMenu(this, fActivate);
if (FAILED(hr))
return hr;
- hr = pmp->SetSubMenu(this, TRUE);
- if (FAILED(hr))
- return hr;
-
- CComPtr<IOleWindow> pTopLevelWindow;
- hr = IUnknown_QueryService(m_site, SID_SMenuPopup, IID_PPV_ARG(IOleWindow, &pTopLevelWindow));
- if (FAILED(hr))
- return hr;
+ if (fActivate)
+ {
+ CComPtr<IOleWindow> pTopLevelWindow;
+ hr = IUnknown_QueryService(m_site, SID_SMenuPopup, IID_PPV_ARG(IOleWindow, &pTopLevelWindow));
+ if (FAILED(hr))
+ return hr;
- hr = pTopLevelWindow->GetWindow(&m_topLevelWindow);
- if (FAILED(hr))
- return hr;
+ hr = pTopLevelWindow->GetWindow(&m_topLevelWindow);
+ if (FAILED(hr))
+ return hr;
+ }
+ else
+ {
+ m_topLevelWindow = NULL;
+ }
return S_FALSE;
}
HRESULT STDMETHODCALLTYPE CMenuBand::QueryService(REFGUID guidService, REFIID riid, void **ppvObject)
{
if (IsEqualIID(guidService, SID_SMenuBandChild) ||
- IsEqualIID(guidService, SID_SMenuBandBottom) ||
+ IsEqualIID(guidService, SID_SMenuBandBottom) ||
IsEqualIID(guidService, SID_SMenuBandBottomSelected))
return this->QueryInterface(riid, ppvObject);
WARN("Unknown service requested %s\n", wine_dbgstr_guid(&guidService));
HRESULT STDMETHODCALLTYPE CMenuBand::OnSelect(DWORD dwSelectType)
{
- CComPtr<IMenuPopup> pmp;
- HRESULT hr = IUnknown_QueryService(m_site, SID_SMenuPopup, IID_PPV_ARG(IMenuPopup, &pmp));
- if (FAILED(hr))
- return hr;
- pmp->OnSelect(dwSelectType);
- return S_OK;
+ switch (dwSelectType)
+ {
+ case MPOS_CHILDTRACKING:
+ // TODO: Cancel timers?
+ return m_subMenuParent->OnSelect(dwSelectType);
+ case MPOS_SELECTLEFT:
+ if (m_subMenuChild)
+ m_subMenuChild->OnSelect(MPOS_CANCELLEVEL);
+ return m_subMenuParent->OnSelect(dwSelectType);
+ case MPOS_SELECTRIGHT:
+ if (m_hotBar && m_hotItem >= 0)
+ {
+ // TODO: popup the current child if it has subitems, otherwise spread up.
+ }
+ return m_subMenuParent->OnSelect(dwSelectType);
+ case MPOS_EXECUTE:
+ case MPOS_FULLCANCEL:
+ if (m_subMenuChild)
+ m_subMenuChild->OnSelect(dwSelectType);
+ return m_subMenuParent->OnSelect(dwSelectType);
+ case MPOS_CANCELLEVEL:
+ if (m_subMenuChild)
+ m_subMenuChild->OnSelect(dwSelectType);
+ break;
+ }
+ return S_FALSE;
}
HRESULT STDMETHODCALLTYPE CMenuBand::SetSubMenu(IMenuPopup *pmp, BOOL fSet)
HRESULT STDMETHODCALLTYPE CMenuBand::GetClient(IUnknown **ppunkClient)
{
- UNIMPLEMENTED;
+ // HACK, so I can test for a submenu in the DeskBar
+ //UNIMPLEMENTED;
+ if (ppunkClient)
+ {
+ if (m_subMenuChild)
+ *ppunkClient = m_subMenuChild;
+ else
+ *ppunkClient = NULL;
+ }
return S_OK;
}
{
case WM_COMMAND:
- if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hWnd))
+ if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hWnd) == S_OK)
{
return m_staticToolbar->OnCommand(wParam, lParam, theResult);
}
- if (m_SFToolbar && m_SFToolbar->IsWindowOwner(hWnd))
+ if (m_SFToolbar && m_SFToolbar->IsWindowOwner(hWnd) == S_OK)
{
return m_SFToolbar->OnCommand(wParam, lParam, theResult);
}
case TBN_HOTITEMCHANGE:
hot = reinterpret_cast<LPNMTBHOTITEM>(hdr);
- if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hWnd))
+ if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hWnd) == S_OK)
{
return m_staticToolbar->OnHotItemChange(hot);
}
- if (m_SFToolbar && m_SFToolbar->IsWindowOwner(hWnd))
+ if (m_SFToolbar && m_SFToolbar->IsWindowOwner(hWnd) == S_OK)
{
return m_SFToolbar->OnHotItemChange(hot);
}
case NM_RCLICK:
rclick = reinterpret_cast<LPNMMOUSE>(hdr);
- if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hWnd))
+ if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hWnd) == S_OK)
{
return m_staticToolbar->OnContextMenu(rclick);
}
- if (m_SFToolbar && m_SFToolbar->IsWindowOwner(hWnd))
+ if (m_SFToolbar && m_SFToolbar->IsWindowOwner(hWnd) == S_OK)
{
return m_SFToolbar->OnContextMenu(rclick);
}
HRESULT STDMETHODCALLTYPE CMenuBand::IsWindowOwner(HWND hWnd)
{
- if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hWnd))
+ if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hWnd) == S_OK)
return S_OK;
- if (m_SFToolbar && m_SFToolbar->IsWindowOwner(hWnd))
+ if (m_SFToolbar && m_SFToolbar->IsWindowOwner(hWnd) == S_OK)
return S_OK;
return S_FALSE;
return S_OK;
}
-HRESULT CMenuBand::CallCBWithId(UINT id, UINT uMsg, WPARAM wParam, LPARAM lParam)
+HRESULT CMenuBand::_CallCBWithItemId(UINT id, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
return _CallCB(uMsg, wParam, lParam, id);
}
-HRESULT CMenuBand::CallCBWithPidl(LPITEMIDLIST pidl, UINT uMsg, WPARAM wParam, LPARAM lParam)
+HRESULT CMenuBand::_CallCBWithItemPidl(LPITEMIDLIST pidl, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
return _CallCB(uMsg, wParam, lParam, 0, pidl);
}
return hr;
}
-HRESULT CMenuBand::TrackPopup(HMENU popup, INT x, INT y)
+HRESULT CMenuBand::_TrackSubMenuUsingTrackPopupMenu(HMENU popup, INT x, INT y)
{
::TrackPopupMenu(popup, 0, x, y, 0, m_menuOwner, NULL);
return S_OK;
}
-HRESULT CMenuBand::GetTopLevelWindow(HWND*topLevel)
+HRESULT CMenuBand::_GetTopLevelWindow(HWND*topLevel)
{
*topLevel = m_topLevelWindow;
return S_OK;
-}
\ No newline at end of file
+}
+
+HRESULT CMenuBand::_OnHotItemChanged(CMenuToolbarBase * tb, INT id)
+{
+ if (m_hotBar && m_hotBar != tb)
+ m_hotBar->ChangeHotItem(-1);
+ m_hotBar = tb;
+ m_hotItem = id;
+ return S_OK;
+}
+
+HRESULT CMenuBand::_MenuItemHotTrack(DWORD changeType)
+{
+ HRESULT hr;
+
+ if (changeType == VK_DOWN)
+ {
+ if (m_SFToolbar && (m_hotBar == m_SFToolbar || m_hotBar == NULL))
+ {
+ hr = m_SFToolbar->ChangeHotItem(VK_DOWN);
+ if (hr == S_FALSE)
+ {
+ if (m_staticToolbar)
+ return m_staticToolbar->ChangeHotItem(VK_HOME);
+ else
+ return m_SFToolbar->ChangeHotItem(VK_HOME);
+ }
+ return hr;
+ }
+ else if (m_staticToolbar && m_hotBar == m_staticToolbar)
+ {
+ hr = m_staticToolbar->ChangeHotItem(VK_DOWN);
+ if (hr == S_FALSE)
+ {
+ if (m_SFToolbar)
+ return m_SFToolbar->ChangeHotItem(VK_HOME);
+ else
+ return m_staticToolbar->ChangeHotItem(VK_HOME);
+ }
+ return hr;
+ }
+ }
+ else if (changeType == VK_UP)
+ {
+ if (m_staticToolbar && (m_hotBar == m_staticToolbar || m_hotBar == NULL))
+ {
+ hr = m_staticToolbar->ChangeHotItem(VK_DOWN);
+ if (hr == S_FALSE)
+ {
+ if (m_SFToolbar)
+ return m_SFToolbar->ChangeHotItem(VK_END);
+ else
+ return m_staticToolbar->ChangeHotItem(VK_END);
+ }
+ return hr;
+ }
+ else if (m_SFToolbar && m_hotBar == m_SFToolbar)
+ {
+ hr = m_SFToolbar->ChangeHotItem(VK_UP);
+ if (hr == S_FALSE)
+ {
+ if (m_staticToolbar)
+ return m_staticToolbar->ChangeHotItem(VK_END);
+ else
+ return m_SFToolbar->ChangeHotItem(VK_END);
+ }
+ return hr;
+ }
+ }
+ else
+ {
+ m_subMenuParent->OnSelect(changeType);
+ }
+ return S_OK;
+}
+
+HRESULT CMenuBand::_OnPopupSubMenu(IMenuPopup * popup, POINTL * pAt, RECTL * pExclude)
+{
+ if (m_subMenuChild)
+ {
+ HRESULT hr = m_subMenuChild->OnSelect(MPOS_CANCELLEVEL);
+ if (FAILED(hr))
+ return hr;
+ }
+ m_subMenuChild = popup;
+ if (popup)
+ {
+ IUnknown_SetSite(popup, m_subMenuParent);
+ popup->Popup(pAt, pExclude, MPPF_RIGHT);
+ }
+ return S_OK;
+}
projects / reactos.git / blobdiff