diff options
Diffstat (limited to 'libjava/javax/swing/plaf/basic/BasicMenuItemUI.java')
| -rw-r--r-- | libjava/javax/swing/plaf/basic/BasicMenuItemUI.java | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/libjava/javax/swing/plaf/basic/BasicMenuItemUI.java b/libjava/javax/swing/plaf/basic/BasicMenuItemUI.java index ff48a74f074..50af23ac641 100644 --- a/libjava/javax/swing/plaf/basic/BasicMenuItemUI.java +++ b/libjava/javax/swing/plaf/basic/BasicMenuItemUI.java @@ -605,7 +605,17 @@ public class BasicMenuItemUI extends MenuItemUI if (text != null && ! text.equals("")) { if (menuItem.isEnabled()) - g.setColor(menuItem.getForeground()); + { + /* Menu item is considered to be highlighted when it is selected. + It is considered to be selected if menu item is inside some menu + and is armed or if it is both armed and pressed */ + if (menuItem.getModel().isArmed() + && (menuItem.getParent() instanceof MenuElement + || menuItem.getModel().isPressed())) + g.setColor(selectionForeground); + else + g.setColor(menuItem.getForeground()); + } else // FIXME: should fix this to use 'disabledForeground', but its // default value in BasicLookAndFeel is null. |