diff options
author | Anthony Balkissoon <abalkiss@redhat.com> | 2005-07-12 20:59:57 +0000 |
---|---|---|
committer | Anthony Balkissoon <abalkiss@redhat.com> | 2005-07-12 20:59:57 +0000 |
commit | 9e290453dfef9de486978dd5f0eca2c5ea8bb7e2 (patch) | |
tree | 7b13a12a070a217f70f9c094c56ec8c167f533f9 | |
parent | 6f24490592fa3c34cc0a938d03558d84cf3ad1ba (diff) | |
download | classpath-9e290453dfef9de486978dd5f0eca2c5ea8bb7e2.tar.gz |
2005-07-12 Anthony Balkissoon <abalkiss@redhat.com>
* javax/swing/plaf/basic/BasicMenuItemUI.java:
(paintMenuItem): Replaced incorrect hilighting criteria.
(paintText): Likewise.
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | javax/swing/plaf/basic/BasicMenuItemUI.java | 6 |
2 files changed, 12 insertions, 2 deletions
@@ -1,9 +1,17 @@ +2005-07-12 Anthony Balkissoon <abalkiss@redhat.com> + + * javax/swing/plaf/basic/BasicMenuItemUI.java: + (paintMenuItem): Replaced incorrect hilighting criteria. + (paintText): Likewise. + 2005-07-12 Lillian Angel <langel@redhat.com> + * examples/gnu/classpath/examples/swing/Demo.java (mkTree): no need to make root visible, it is by default (mkTreeWorld): no need to make root visible, it is by default 2005-07-12 Lillian Angel <langel@redhat.com> + * javax/swing/plaf/basic/BasicTreeUI.java (paintLeaf): fixed size of selection background to depend on if icon exists diff --git a/javax/swing/plaf/basic/BasicMenuItemUI.java b/javax/swing/plaf/basic/BasicMenuItemUI.java index d5d70779a..a5bf0822a 100644 --- a/javax/swing/plaf/basic/BasicMenuItemUI.java +++ b/javax/swing/plaf/basic/BasicMenuItemUI.java @@ -507,7 +507,8 @@ public class BasicMenuItemUI extends MenuItemUI br.height += insets.top + insets.bottom; // Menu item is considered to be highlighted when it is selected. - if (m.isSelected()) + if (m.isSelected() || m.getModel().isArmed() && + (m.getParent() instanceof MenuElement)) { if (m.isContentAreaFilled()) { @@ -604,7 +605,8 @@ public class BasicMenuItemUI extends MenuItemUI if (menuItem.isEnabled()) { // Menu item is considered to be highlighted when it is selected. - if (menuItem.isSelected()) + if (menuItem.isSelected() || menuItem.getModel().isArmed() && + (menuItem.getParent() instanceof MenuElement)) g.setColor(selectionForeground); else g.setColor(menuItem.getForeground()); |