From ccc28900910de48ca337ff0b07a9fe0605d637d5 Mon Sep 17 00:00:00 2001 From: mkoch Date: Thu, 19 Jun 2003 10:48:46 +0000 Subject: 2003-06-19 Michael Koch * java/awt/Font.java javax/swing/UIManager.java javax/swing/border/AbstractBorder.java javax/swing/border/BevelBorder.java javax/swing/border/Border.java javax/swing/border/CompoundBorder.java javax/swing/border/EmptyBorder.java javax/swing/border/EtchedBorder.java javax/swing/border/LineBorder.java javax/swing/border/MatteBorder.java javax/swing/border/TitledBorder.java javax/swing/plaf/BorderUIResource.java javax/swing/plaf/basic/BasicBorders.java javax/swing/plaf/basic/BasicButtonUI.java javax/swing/plaf/basic/BasicCheckBoxUI.java javax/swing/plaf/basic/BasicGraphicsUtils.java javax/swing/plaf/basic/BasicLabelUI.java javax/swing/plaf/basic/BasicRadioButtonUI.java javax/swing/plaf/basic/BasicToggleButtonUI.java: New versions from classpath. * javax/swing/border/SoftBevelBorder.java: New file from classpath. * javax/swing/border/doc-files/LineBorder-1.png, javax/swing/border/doc-files/BevelBorder-1.png, javax/swing/border/doc-files/BevelBorder-2.png, javax/swing/border/doc-files/BevelBorder-3.png, javax/swing/border/doc-files/EmptyBorder-1.png, javax/swing/border/doc-files/EtchedBorder-1.png, javax/swing/border/doc-files/EtchedBorder-2.png, javax/swing/border/doc-files/MatteBorder-1.png, javax/swing/border/doc-files/MatteBorder-2.png, javax/swing/border/doc-files/MatteBorder-3.png, javax/swing/border/doc-files/MatteBorder-4.png, javax/swing/border/doc-files/MatteBorder-5.png, javax/swing/border/doc-files/MatteBorder-6.png, javax/swing/border/doc-files/SoftBevelBorder-1.png, javax/swing/border/doc-files/SoftBevelBorder-2.png, javax/swing/border/doc-files/SoftBevelBorder-3.png, javax/swing/plaf/basic/doc-files/BasicBorders.MarginBorder-1.png, javax/swing/plaf/basic/doc-files/BasicBorders.ButtonBorder-1.png, javax/swing/plaf/basic/doc-files/BasicGraphicsUtils-1.png, javax/swing/plaf/basic/doc-files/BasicGraphicsUtils-2.png, javax/swing/plaf/basic/doc-files/BasicGraphicsUtils-3.png, javax/swing/plaf/basic/doc-files/BasicGraphicsUtils-4.png, javax/swing/plaf/basic/doc-files/BasicGraphicsUtils-5.png, javax/swing/plaf/basic/doc-files/BasicGraphicsUtils-6.png, javax/swing/plaf/basic/doc-files/BasicGraphicsUtils-7.png: New binary files from classpath. * Makefile.am (awt_java_source_files): Added javax/swing/border/SoftBevelBorder.java. * Makefile.in: Regenerated. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@68190 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/javax/swing/plaf/basic/BasicButtonUI.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'libjava/javax/swing/plaf/basic/BasicButtonUI.java') diff --git a/libjava/javax/swing/plaf/basic/BasicButtonUI.java b/libjava/javax/swing/plaf/basic/BasicButtonUI.java index 3f67c512874..d901e7ddeb7 100644 --- a/libjava/javax/swing/plaf/basic/BasicButtonUI.java +++ b/libjava/javax/swing/plaf/basic/BasicButtonUI.java @@ -74,14 +74,7 @@ public class BasicButtonUI extends ButtonUI public Dimension getPreferredSize(JComponent c) { AbstractButton b = (AbstractButton)c; - Dimension d = BasicGraphicsUtils.getPreferredSize(b, - gap, - b.getText(), - b.getIcon(), - b.getVerticalAlignment(), - b.getHorizontalAlignment(), - b.getHorizontalTextPosition(), - b.getVerticalTextPosition()); + Dimension d = BasicGraphicsUtils.getPreferredButtonSize(b, gap); // System.out.println("^^^^^^^^^^^^^^^^^^^^^^ BASIC-PREF="+d + ",T="+b.text); return d; } @@ -99,7 +92,7 @@ public class BasicButtonUI extends ButtonUI g.setFont(f); - FontMetrics fm = SwingUtilities.getFontMetrics(f); + FontMetrics fm = g.getFontMetrics(f); Insets i = c.getInsets(); @@ -198,7 +191,7 @@ public class BasicButtonUI extends ButtonUI g.setFont(f); - FontMetrics fm = SwingUtilities.getFontMetrics(f); + FontMetrics fm = g.getFontMetrics(f); g.setColor(c.isEnabled() ? textColor : disabledTextColor); -- cgit v1.2.3