/[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.7.2.1 by gnu_andrew, Sat Jan 15 17:02:21 2005 UTC revision 1.7.2.2 by gnu_andrew, Sun Jan 16 02:14:49 2005 UTC
# Line 60  import javax.swing.JPopupMenu; Line 60  import javax.swing.JPopupMenu;
60  import javax.swing.KeyStroke;  import javax.swing.KeyStroke;
61  import javax.swing.MenuElement;  import javax.swing.MenuElement;
62  import javax.swing.MenuSelectionManager;  import javax.swing.MenuSelectionManager;
63    import javax.swing.SwingConstants;
64  import javax.swing.SwingUtilities;  import javax.swing.SwingUtilities;
65  import javax.swing.UIDefaults;  import javax.swing.UIDefaults;
66  import javax.swing.UIManager;  import javax.swing.UIManager;
# Line 392  public class BasicMenuItemUI extends Men Line 393  public class BasicMenuItemUI extends Men
393      selectionBackground = defaults.getColor("MenuItem.selectionBackground");      selectionBackground = defaults.getColor("MenuItem.selectionBackground");
394      selectionForeground = defaults.getColor("MenuItem.selectionForeground");      selectionForeground = defaults.getColor("MenuItem.selectionForeground");
395      acceleratorDelimiter = defaults.getString("MenuItem.acceleratorDelimiter");      acceleratorDelimiter = defaults.getString("MenuItem.acceleratorDelimiter");
396    
397        menuItem.setHorizontalTextPosition(SwingConstants.TRAILING);
398        menuItem.setHorizontalAlignment(SwingConstants.LEADING);
399    }    }
400    
401    /**    /**
# Line 551  public class BasicMenuItemUI extends Men Line 555  public class BasicMenuItemUI extends Men
555            }            }
556        }        }
557    
     // paint icon  
     // FIXME: should paint different icon at different button state's.  
     // i.e disabled icon when button is disabled.. etc.  
     Icon i = m.getIcon();  
     if (i != null)  
       {  
         i.paintIcon(c, g, vr.x, vr.y);  
   
         // Adjust view rectangle, s.t text would be drawn after menu item's icon.  
         vr.x += i.getIconWidth() + defaultTextIconGap;  
       }  
   
558      // paint text and user menu icon if it exists                  // paint text and user menu icon if it exists            
559      SwingUtilities.layoutCompoundLabel(c, fm, m.getText(), m.getIcon(),      Icon i = m.getIcon();
560        SwingUtilities.layoutCompoundLabel(c, fm, m.getText(), i,
561                                         vertAlign, horAlign, vertTextPos,                                         vertAlign, horAlign, vertTextPos,
562                                         horTextPos, vr, ir, tr,                                         horTextPos, vr, ir, tr,
563                                         defaultTextIconGap);                                         defaultTextIconGap);
564        if (i != null)
565          i.paintIcon(c, g, ir.x, ir.y);
566    
567      paintText(g, m, tr, m.getText());      paintText(g, m, tr, m.getText());
568    

Legend:
Removed from v.1.7.2.1  
changed lines
  Added in v.1.7.2.2

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