IDEA-200158 High Contrast Theme: Menu bar and popup menu items are not...

IDEA-200158 High Contrast Theme: Menu bar and popup menu items are not highlighted when selected after restarting IDEA with "High Contrast" theme set

(cherry picked from commit 7c4e0730)

(cherry picked from commit 6d61cb33)

platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties

@@ -43,6 +43,7 @@ MenuItem.acceleratorDelimiter=-
 MenuItem.disabledForeground=808080
 MenuItem.border=com.intellij.ide.ui.laf.darcula.ui.DarculaMenuItemBorder
 Menu.border=com.intellij.ide.ui.laf.darcula.ui.DarculaMenuItemBorder
+Menu.opaque=true
 
 EditorPane.inactiveBackground=45494A
 EditorPane.inactiveForeground=bbbbbb

platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf.properties

@@ -38,6 +38,7 @@ MenuItem.maxGutterIconWidth=18
 MenuItem.acceleratorDelimiter=-
 MenuItem.border=com.intellij.ide.ui.laf.darcula.ui.DarculaMenuItemBorder
 Menu.border=com.intellij.ide.ui.laf.darcula.ui.DarculaMenuItemBorder
+Menu.opaque=true
 
 EditorPaneUI=com.intellij.ide.ui.laf.darcula.ui.DarculaEditorPaneUI
 

platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf_native.properties

@@ -35,11 +35,19 @@ DialogWrapper.southPanelDivider=f0f0f0
 DialogWrapper.southPanelBackground=f0f0f0
 OnePixelDivider.background=adadad
 
-Menu.maxGutterIconWidth=18
+MenuBar.border=com.intellij.ide.ui.laf.darcula.ui.DarculaMenuBarBorder
+MenuBar.borderColor=cdcdcd
+MenuBar.disabledBackground=cccccc
+
 MenuItem.maxGutterIconWidth=18
 MenuItem.acceleratorDelimiter=-
 MenuItem.border=com.intellij.ide.ui.laf.darcula.ui.DarculaMenuItemBorder
+
+Menu.maxGutterIconWidth=18
 Menu.border=com.intellij.ide.ui.laf.darcula.ui.DarculaMenuItemBorder
+Menu.borderColor=cdcdcd
+Menu.opaque=true
+Menu.separatorColor=cdcdcd
 
 EditorPaneUI=com.intellij.ide.ui.laf.darcula.ui.DarculaEditorPaneUI
 
@@ -68,19 +76,11 @@ TableHeader.cellBorder=com.intellij.ide.ui.laf.darcula.DarculaTableHeaderBorder
 
 TitledBorder.titleColor=000000
 
-MenuBar.disabledBackground=cccccc
-
 SeparatorUI=com.intellij.ide.ui.laf.darcula.ui.DarculaSeparatorUI
 Separator.foreground=cdcdcd
 
 PopupMenuSeparatorUI=com.intellij.ide.ui.laf.darcula.ui.DarculaMenuSeparatorUI
-Menu.separatorColor=cdcdcd
-
 PopupMenu.border=com.intellij.ide.ui.laf.darcula.ui.DarculaPopupMenuBorder
-Menu.borderColor=cdcdcd
-
-MenuBar.border=com.intellij.ide.ui.laf.darcula.ui.DarculaMenuBarBorder
-MenuBar.borderColor=cdcdcd
 
 Group.separatorColor=cdcdcd
 

platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionMenu.java

@@ -70,9 +70,6 @@ public final class ActionMenu extends JBMenu {
     if (SystemInfo.isMacSystemMenu) {
       installSynchronizer();
     }
-    if (UIUtil.isUnderIntelliJLaF()) {
-      setOpaque(true);
-    }
 
     // Triggering initialization of private field "popupMenu" from JMenu with our own JBPopupMenu
     getPopupMenu();