commit db9b55dcadb0c4172f67bd8864183f0147d86920
author Mikhail Dzianishchyts <mikhail.dzianishchyts@gmail.com> Tue Jun 25 14:17:08 2024 +0300
committer Mikhail Dzianishchyts <mikhail.dzianishchyts@gmail.com> Tue Jun 25 14:19:02 2024 +0300
tree 5c71f039e92f863468b3d906a54dc99b9b6aaecd
parent 647621ac4adea5eb7dbad66e9d6d382bad96bbd6

Fix menu item background and foreground colors

modeler/cayenne-modeler-generic-ext/src/main/java/org/apache/cayenne/modeler/generic/GenericPlatformInitializer.java

diff --git a/modeler/cayenne-modeler-generic-ext/src/main/java/org/apache/cayenne/modeler/generic/GenericPlatformInitializer.java b/modeler/cayenne-modeler-generic-ext/src/main/java/org/apache/cayenne/modeler/generic/GenericPlatformInitializer.java
index 56a4c76..465b65d 100644
--- a/modeler/cayenne-modeler-generic-ext/src/main/java/org/apache/cayenne/modeler/generic/GenericPlatformInitializer.java
+++ b/modeler/cayenne-modeler-generic-ext/src/main/java/org/apache/cayenne/modeler/generic/GenericPlatformInitializer.java
@@ -82,8 +82,12 @@
         UIManager.put("SplitPane.border",               BorderFactory.createEmptyBorder());
         UIManager.put("ToolBar.border",                 BorderFactory.createEmptyBorder(1, 1, 1, 1));
         UIManager.put("CheckBoxHeader.border",          BorderFactory.createEmptyBorder(0, 15, 0, 0));
-        UIManager.put("MenuItem.selectionBackground",   greyHighlight);
-        UIManager.put("MenuItem.selectionForeground",   Color.BLACK);
+        UIManager.put("MenuItem.selectionBackground",            greyHighlight);
+        UIManager.put("CheckBoxMenuItem.selectionBackground",    greyHighlight);
+        UIManager.put("RadioButtonMenuItem.selectionBackground", greyHighlight);
+        UIManager.put("MenuItem.selectionForeground",            Color.BLACK);
+        UIManager.put("CheckBoxMenuItem.selectionForeground",    Color.BLACK);
+        UIManager.put("RadioButtonMenuItem.selectionForeground", Color.BLACK);
         // this one is custom for MainToolBar
         UIManager.put("MainToolBar.border",             BorderFactory.createLineBorder(Color.GRAY));
     }

modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinPlatformInitializer.java

diff --git a/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinPlatformInitializer.java b/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinPlatformInitializer.java
index 99087e1..659a17b 100644
--- a/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinPlatformInitializer.java
+++ b/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinPlatformInitializer.java
@@ -68,9 +68,15 @@
         UIManager.put("Separator.background",   darkGrey);
         UIManager.put("Separator.foreground",   darkGrey);
         UIManager.put("Separator.opaque",       Boolean.TRUE);
-        UIManager.put("MenuItem.selectionBackground",   darkGrey);
-        UIManager.put("MenuItem.selectionForeground",   Color.BLACK);
-        UIManager.put("MenuItem.opaque",        Boolean.TRUE);
+        UIManager.put("MenuItem.selectionBackground",            darkGrey);
+        UIManager.put("CheckBoxMenuItem.selectionBackground",    darkGrey);
+        UIManager.put("RadioButtonMenuItem.selectionBackground", darkGrey);
+        UIManager.put("MenuItem.selectionForeground",            Color.BLACK);
+        UIManager.put("CheckBoxMenuItem.selectionForeground",    Color.BLACK);
+        UIManager.put("RadioButtonMenuItem.selectionForeground", Color.BLACK);
+        UIManager.put("MenuItem.opaque",            Boolean.TRUE);
+        UIManager.put("CheckBoxMenuItem.opaque",    Boolean.TRUE);
+        UIManager.put("RadioButtonMenuItem.opaque", Boolean.TRUE);
         UIManager.put("Button.border", BorderFactory.createEmptyBorder());
     }
 }