Hi Roman,
On Thu, 2005-11-24 at 20:32 +0000, Roman Kennke wrote:
> I removed some unnecessary code from the BasicLabelUI.
>
> 2005-11-24 Roman Kennke <[EMAIL PROTECTED]>
>
> * javax/swing/plaf/basic/BasicLabelUI.java
> (getPreferredSize): Don't use deprecated method to acquire
> FontMetrics object. This can be done more elegantly using
> Component.getFontMetrics().
> (paint): Removed unnecessary font setting code. This is already
> performed in JComponent.getComponentGraphics().
This was missing the attached patch.
But it looks fine.
Cheers,
Mark
===================================================================
RCS file: /cvsroot/classpath/cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicLabelUI.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- classpath/classpath/javax/swing/plaf/basic/BasicLabelUI.java 2005/10/18 22:10:32 1.20
+++ classpath/classpath/javax/swing/plaf/basic/BasicLabelUI.java 2005/11/24 20:31:32 1.21
@@ -39,7 +39,6 @@
import java.awt.Color;
import java.awt.Dimension;
-import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Graphics;
import java.awt.Insets;
@@ -104,7 +103,7 @@
Rectangle ir = new Rectangle();
Rectangle tr = new Rectangle();
Insets insets = lab.getInsets();
- FontMetrics fm = lab.getToolkit().getFontMetrics(lab.getFont());
+ FontMetrics fm = lab.getFontMetrics(lab.getFont());
layoutCL(lab, fm, lab.getText(), lab.getIcon(), vr, ir, tr);
Rectangle cr = tr.union(ir);
return new Dimension(insets.left + cr.width + insets.right, insets.top
@@ -150,17 +149,11 @@
{
JLabel b = (JLabel) c;
- Font saved_font = g.getFont();
-
Rectangle tr = new Rectangle();
Rectangle ir = new Rectangle();
Rectangle vr = new Rectangle();
- Font f = c.getFont();
-
- g.setFont(f);
- FontMetrics fm = g.getFontMetrics(f);
-
+ FontMetrics fm = g.getFontMetrics();
vr = SwingUtilities.calculateInnerArea(c, vr);
if (vr.width < 0)
@@ -182,8 +175,6 @@
else
paintDisabledText(b, g, text, tr.x, tr.y + fm.getAscent());
}
-
- g.setFont(saved_font);
}
/**
_______________________________________________
Classpath-patches mailing list
Classpath-patches@gnu.org
http://lists.gnu.org/mailman/listinfo/classpath-patches
