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

[RSHELL]

Browse source 
* CStartMenu: Update the icon resource IDs to the IDs with the smaller images. This causes the images not to show. Need help figuring out why.
* Misc changes.
CORE-7586

svn path=/branches/shell-experiments/; revision=62328
This commit is contained in:
David Quintana 2014-02-25 10:44:28 +00:00
parent 2902b1cf0c
commit 5ee1aff4f5
5 changed files with 25 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
base/shell/rshell/CMenuBand.cpp
View file

@ -875,10 +875,8 @@ HRESULT CMenuBand::_MenuItemHotTrack(DWORD changeType)
{
if (m_hotBar && m_hotItem >= 0)
{
// TODO: popup the current child if it has subitems, otherwise spread up.
if (m_hotBar->HasSubMenu(m_hotItem)==S_OK)
{
LRESULT result;
m_hotBar->PopupItem(m_hotItem);
return S_FALSE;
}

31
base/shell/rshell/CMenuToolbars.cpp
View file

@ -64,6 +64,13 @@ HRESULT CMenuToolbarBase::ShowWindow(BOOL fShow)
{
::ShowWindow(m_hwnd, fShow ? SW_SHOW : SW_HIDE);
UpdateImageLists();
return S_OK;
}
HRESULT CMenuToolbarBase::UpdateImageLists()
{
int shiml;
if (m_menuBand->UseBigIcons())
{
@ -85,7 +92,6 @@ HRESULT CMenuToolbarBase::ShowWindow(BOOL fShow)
{
SendMessageW(m_hwndToolbar, TB_SETIMAGELIST, 0, 0);
}
return S_OK;
}
@ -163,31 +169,12 @@ HRESULT CMenuToolbarBase::CreateToolbar(HWND hwndParent, DWORD dwFlags)
// SendMessageW(m_hwnd, TB_SETIMAGELIST, 0, 0);
//}
//else
int shiml;
if (m_menuBand->UseBigIcons())
{
shiml = SHIL_LARGE;
SendMessageW(hwndToolbar, TB_SETPADDING, 0, MAKELPARAM(0, 0));
}
else
{
shiml = SHIL_SMALL;
}
IImageList * piml;
HRESULT hr = SHGetImageList(shiml, IID_PPV_ARG(IImageList, &piml));
if (SUCCEEDED(hr))
{
SendMessageW(hwndToolbar, TB_SETIMAGELIST, 0, reinterpret_cast<LPARAM>(piml));
}
else
{
SendMessageW(hwndToolbar, TB_SETIMAGELIST, 0, 0);
}
SetWindowLongPtr(hwndToolbar, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(this));
m_SubclassOld = (WNDPROC) SetWindowLongPtr(hwndToolbar, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(CMenuToolbarBase::s_SubclassProc));
UpdateImageLists();
return S_OK;
}

2
base/shell/rshell/CMenuToolbars.h
View file

@ -70,6 +70,8 @@ public:
protected:
LRESULT CALLBACK SubclassProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
HRESULT UpdateImageLists();
};
class CMenuStaticToolbar :

23
base/shell/rshell/CStartMenu.cpp
View file

@ -90,23 +90,26 @@ private:
switch (psmd->uId)
{
case IDM_PROGRAMS: iconIndex = -20; break;
case IDM_FAVORITES: iconIndex = -173; break;
case IDM_DOCUMENTS: iconIndex = -21; break;
case IDM_SETTINGS: iconIndex = -22; break;
// Smaller "24x24" icons used for the start menu
// The bitmaps are still 32x32, but the image is centered
case IDM_FAVORITES: iconIndex = -209; break;
case IDM_SEARCH: iconIndex = -210; break;
case IDM_HELPANDSUPPORT: iconIndex = -211; break;
case IDM_LOGOFF: iconIndex = -212; break;
case IDM_PROGRAMS: iconIndex = -213; break;
case IDM_DOCUMENTS: iconIndex = -214; break;
case IDM_RUN: iconIndex = -215; break;
case IDM_SHUTDOWN: iconIndex = -216; break;
case IDM_SETTINGS: iconIndex = -217; break;
case IDM_CONTROLPANEL: iconIndex = -22; break;
//case IDM_SECURITY: iconIndex = -21; break;
case IDM_NETWORKCONNECTIONS: iconIndex = -257; break;
case IDM_PRINTERSANDFAXES: iconIndex = -138; break;
case IDM_TASKBARANDSTARTMENU: iconIndex = -40; break;
case IDM_SEARCH: iconIndex = -23; break;
case IDM_HELPANDSUPPORT: iconIndex = -24; break;
case IDM_RUN: iconIndex = -25; break;
//case IDM_SECURITY: iconIndex = -21; break;
//case IDM_SYNCHRONIZE: iconIndex = -21; break;
case IDM_LOGOFF: iconIndex = -45; break;
//case IDM_DISCONNECT: iconIndex = -21; break;
//case IDM_UNDOCKCOMPUTER: iconIndex = -21; break;
case IDM_SHUTDOWN: iconIndex = -28; break;
default:
return S_FALSE;
}

2
base/shell/rshell/wraplog.cpp
View file

@ -13,7 +13,7 @@ void WrapLogOpen()
{
if (openCount == 0)
{
log = fopen("G:\\RShellWrap.log", "w");
log = fopen("RShellWrap.log", "w");
nTemps = 0;
callLevel = 0;
}