Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 16:32:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32] -CMenuBand: When the flat menus style is enabled, shell menu bars should not look like toolbars.

Browse source 
svn path=/trunk/; revision=75058
This commit is contained in:
Giannis Adamopoulos 2017-06-16 17:53:50 +00:00
parent 8c8f34f7fd
commit 3770c2d134
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp
View file

@ -160,7 +160,10 @@ HRESULT CMenuToolbarBase::OnCustomDraw(LPNMTBCUSTOMDRAW cdraw, LRESULT * theResu
isHot = m_hotBar == this && (int) cdraw->nmcd.dwItemSpec == m_hotItem; isHot = m_hotBar == this && (int) cdraw->nmcd.dwItemSpec == m_hotItem;
isPopup = m_popupBar == this && (int) cdraw->nmcd.dwItemSpec == m_popupItem; isPopup = m_popupBar == this && (int) cdraw->nmcd.dwItemSpec == m_popupItem;
if ((m_initFlags & SMINIT_VERTICAL)) if (m_hotItem < 0 && isPopup)
isHot = TRUE;
if ((m_useFlatMenus && isHot) || (m_initFlags & SMINIT_VERTICAL))
{ {
COLORREF clrText; COLORREF clrText;
HBRUSH bgBrush; HBRUSH bgBrush;
@ -171,7 +174,7 @@ HRESULT CMenuToolbarBase::OnCustomDraw(LPNMTBCUSTOMDRAW cdraw, LRESULT * theResu
cdraw->nmcd.uItemState &= ~(CDIS_HOT | CDIS_CHECKED); cdraw->nmcd.uItemState &= ~(CDIS_HOT | CDIS_CHECKED);
// Decide on the colors // Decide on the colors
if (isHot || (m_hotItem < 0 && isPopup)) if (isHot)
{ {
cdraw->nmcd.uItemState |= CDIS_HOT; cdraw->nmcd.uItemState |= CDIS_HOT;
@ -203,7 +206,7 @@ HRESULT CMenuToolbarBase::OnCustomDraw(LPNMTBCUSTOMDRAW cdraw, LRESULT * theResu
cdraw->nmcd.uItemState &= ~CDIS_HOT; cdraw->nmcd.uItemState &= ~CDIS_HOT;
// Decide on the colors // Decide on the colors
if (isHot || (m_hotItem < 0 && isPopup)) if (isHot)
{ {
cdraw->nmcd.uItemState |= CDIS_HOT; cdraw->nmcd.uItemState |= CDIS_HOT;
} }