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

Author: gadamopoulos
Date: Fri Jun 16 17:53:50 2017
New Revision: 75058

URL: http://svn.reactos.org/svn/reactos?rev=75058&view=rev
Log:
[SHELL32] -CMenuBand: When the flat menus style is enabled, shell menu bars should not look like toolbars.

Modified:
    trunk/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp

Modified: trunk/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmenu...
==============================================================================
--- trunk/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp	[iso-8859-1] Fri Jun 16 17:53:50 2017
@@ -160,7 +160,10 @@
         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 @@
             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 @@
             cdraw->nmcd.uItemState &= ~CDIS_HOT;

// Decide on the colors
-            if (isHot || (m_hotItem < 0 && isPopup))
+            if (isHot)
             {
                 cdraw->nmcd.uItemState |= CDIS_HOT;
             }