Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-06 01:41:22 +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
Download patch file Download diff file Expand all files Collapse all files

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;
}