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

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

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

revision 1.10.2.4 by gnu_andrew, Wed Nov 2 00:43:54 2005 UTC revision 1.10.2.5 by gnu_andrew, Sun Nov 27 21:00:39 2005 UTC
# Line 39  package javax.swing.plaf.basic; Line 39  package javax.swing.plaf.basic;
39    
40  import java.awt.Color;  import java.awt.Color;
41  import java.awt.Dimension;  import java.awt.Dimension;
 import java.awt.Font;  
42  import java.awt.FontMetrics;  import java.awt.FontMetrics;
43  import java.awt.Graphics;  import java.awt.Graphics;
44  import java.awt.Insets;  import java.awt.Insets;
# Line 104  public class BasicLabelUI extends LabelU Line 103  public class BasicLabelUI extends LabelU
103      Rectangle ir = new Rectangle();      Rectangle ir = new Rectangle();
104      Rectangle tr = new Rectangle();      Rectangle tr = new Rectangle();
105      Insets insets = lab.getInsets();      Insets insets = lab.getInsets();
106      FontMetrics fm = lab.getToolkit().getFontMetrics(lab.getFont());      FontMetrics fm = lab.getFontMetrics(lab.getFont());
107      layoutCL(lab, fm, lab.getText(), lab.getIcon(), vr, ir, tr);      layoutCL(lab, fm, lab.getText(), lab.getIcon(), vr, ir, tr);
108      Rectangle cr = tr.union(ir);      Rectangle cr = tr.union(ir);
109      return new Dimension(insets.left + cr.width + insets.right, insets.top      return new Dimension(insets.left + cr.width + insets.right, insets.top
# Line 150  public class BasicLabelUI extends LabelU Line 149  public class BasicLabelUI extends LabelU
149    {    {
150      JLabel b = (JLabel) c;      JLabel b = (JLabel) c;
151    
     Font saved_font = g.getFont();  
   
152      Rectangle tr = new Rectangle();      Rectangle tr = new Rectangle();
153      Rectangle ir = new Rectangle();      Rectangle ir = new Rectangle();
154      Rectangle vr = new Rectangle();      Rectangle vr = new Rectangle();
155    
156      Font f = c.getFont();      FontMetrics fm = g.getFontMetrics();
   
     g.setFont(f);  
     FontMetrics fm = g.getFontMetrics(f);  
   
157      vr = SwingUtilities.calculateInnerArea(c, vr);      vr = SwingUtilities.calculateInnerArea(c, vr);
158    
159      if (vr.width < 0)      if (vr.width < 0)
# Line 182  public class BasicLabelUI extends LabelU Line 175  public class BasicLabelUI extends LabelU
175        else        else
176          paintDisabledText(b, g, text, tr.x, tr.y + fm.getAscent());          paintDisabledText(b, g, text, tr.x, tr.y + fm.getAscent());
177      }      }
   
     g.setFont(saved_font);  
178    }    }
179    
180    /**    /**

Legend:
Removed from v.1.10.2.4  
changed lines
  Added in v.1.10.2.5

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