/[classpath]/classpath/javax/swing/plaf/basic/BasicMenuItemUI.java
ViewVC logotype

Diff of /classpath/javax/swing/plaf/basic/BasicMenuItemUI.java

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.14 by abalkiss, Tue Jul 12 20:59:57 2005 UTC revision 1.15 by abalkiss, Mon Jul 18 19:30:30 2005 UTC
# Line 507  public class BasicMenuItemUI extends Men Line 507  public class BasicMenuItemUI extends Men
507      br.height += insets.top + insets.bottom;      br.height += insets.top + insets.bottom;
508    
509      // Menu item is considered to be highlighted when it is selected.      // Menu item is considered to be highlighted when it is selected.
510      if (m.isSelected() || m.getModel().isArmed() &&      // But we don't want to paint the background of JCheckBoxMenuItems
511        if ((m.isSelected() && checkIcon == null) || m.getModel().isArmed() &&
512          (m.getParent() instanceof MenuElement))          (m.getParent() instanceof MenuElement))
513        {        {
514          if (m.isContentAreaFilled())          if (m.isContentAreaFilled())
# Line 605  public class BasicMenuItemUI extends Men Line 606  public class BasicMenuItemUI extends Men
606          if (menuItem.isEnabled())          if (menuItem.isEnabled())
607            {            {
608              // Menu item is considered to be highlighted when it is selected.              // Menu item is considered to be highlighted when it is selected.
609              if (menuItem.isSelected() || menuItem.getModel().isArmed() &&              // But not if it's a JCheckBoxMenuItem
610                if ((menuItem.isSelected() && checkIcon == null) || menuItem.getModel().isArmed() &&
611                  (menuItem.getParent() instanceof MenuElement))                  (menuItem.getParent() instanceof MenuElement))
612                g.setColor(selectionForeground);                g.setColor(selectionForeground);
613              else              else

Legend:
Removed from v.1.14  
changed lines
  Added in v.1.15

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26