Menu: Paint with disabled foreground if model is enabled but the menu…

… item not Fixes #260
weisJ · Aug 5, 2021 · 45abd4a · 45abd4a
1 parent e68f78e
commit 45abd4a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/core/src/main/java/com/github/weisj/darklaf/ui/menu/MenuItemUI.java b/core/src/main/java/com/github/weisj/darklaf/ui/menu/MenuItemUI.java
@@ -171,7 +171,7 @@ default void paintItemText(final Graphics g, final JMenuItem menuItem, final Rec
         ButtonModel model = menuItem.getModel();
         FontMetrics fm = SwingUtil.getFontMetrics(menuItem, g);
         int mnemIndex = menuItem.getDisplayedMnemonicIndex();
-        if (!model.isEnabled()) {
+        if (!model.isEnabled() || !menuItem.isEnabled()) {
             g.setColor(getDisabledForeground());
         } else {
             if (model.isArmed() || (menuItem instanceof JMenu && model.isSelected())) {
@@ -197,7 +197,7 @@ default void paintAccText(final Graphics g, final JMenuItem mi, final MenuItemLa
 
     default Color getAcceleratorForeground(final AbstractButton b) {
         ButtonModel model = b.getModel();
-        if (!model.isEnabled()) return getDisabledForeground();
+        if (!model.isEnabled() || !b.isEnabled()) return getDisabledForeground();
         if (model.isArmed() || (b instanceof JMenu && model.isSelected())) {
             return getAcceleratorSelectionForeground();
         } else {