From 3770c2d13494ef9c41d6cd0b3098c3ac440dd1ea Mon Sep 17 00:00:00 2001 From: Giannis Adamopoulos Date: Fri, 16 Jun 2017 17:53:50 +0000 Subject: [PATCH] [SHELL32] -CMenuBand: When the flat menus style is enabled, shell menu bars should not look like toolbars. svn path=/trunk/; revision=75058 --- reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp b/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp index fa3010472d5..9a1a967cbb0 100644 --- a/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp +++ b/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp @@ -160,7 +160,10 @@ HRESULT CMenuToolbarBase::OnCustomDraw(LPNMTBCUSTOMDRAW cdraw, LRESULT * theResu isHot = m_hotBar == this && (int) cdraw->nmcd.dwItemSpec == m_hotItem; 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; HBRUSH bgBrush; @@ -171,7 +174,7 @@ HRESULT CMenuToolbarBase::OnCustomDraw(LPNMTBCUSTOMDRAW cdraw, LRESULT * theResu cdraw->nmcd.uItemState &= ~(CDIS_HOT | CDIS_CHECKED); // Decide on the colors - if (isHot || (m_hotItem < 0 && isPopup)) + if (isHot) { cdraw->nmcd.uItemState |= CDIS_HOT; @@ -203,7 +206,7 @@ HRESULT CMenuToolbarBase::OnCustomDraw(LPNMTBCUSTOMDRAW cdraw, LRESULT * theResu cdraw->nmcd.uItemState &= ~CDIS_HOT; // Decide on the colors - if (isHot || (m_hotItem < 0 && isPopup)) + if (isHot) { cdraw->nmcd.uItemState |= CDIS_HOT; }