diff options
author | graydon hoare <graydon@pobox.com> | 2004-01-27 09:46:24 +0000 |
---|---|---|
committer | graydon hoare <graydon@pobox.com> | 2004-01-27 09:46:24 +0000 |
commit | 8df3e758246e5dba94a2b884272fd60f02f224e9 (patch) | |
tree | 67bc77b5146227178af37213de145fb467b2c6d3 /javax/swing/SwingUtilities.java | |
parent | ec8ea8f1852ab3b93b4a99fa6d91bde620b2a974 (diff) | |
download | classpath-8df3e758246e5dba94a2b884272fd60f02f224e9.tar.gz |
2004-01-22 Graydon Hoare <graydon@redhat.com>
* gnu/java/awt/peer/gtk/GdkClasspathFontPeer.java:
* gnu/java/awt/peer/gtk/GdkGlyphVector.java:
Predicate static initialization on GtkToolkit.useGraphics2D().
* java/awt/Component.java (processPaintEvent): Consume event.
* javax/swing/AbstractButton.java: Reimplement, document.
* javax/swing/DefaultButtonModel.java: Reimplement, document.
* javax/swing/JComponent.java (paint): Use double buffer.
(listenerList): Enable member.
* javax/swing/ToggleButtonModel.java: Remove incorrect constructor.
* javax/swing/JToggleButton.java
(JToggleButton): Modify model constructor.
* javax/swing/SwingUtilities.java
(layoutCompoundLabel): Adjust arithmetic.
* javax/swing/plaf/basic/BasicButtonUI.java: Reimplement, document.
* javax/swing/plaf/basic/BasicGraphicsUtils.java
(getPreferredButtonSize): Include margins in calculation.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
(Java_gnu_java_awt_peer_gtk_GtkWindowPeer_connectSignals):
Receive up events from subordinate layout component.
2004-01-12 Graydon Hoare <graydon@redhat.com>
* gnu/java/awt/gtk/GdkGraphics2D.java
(static): Check GtkToolkit before initializing static state.
(Graphics2D): Don't construct transform with 0.5 unit offset.
Diffstat (limited to 'javax/swing/SwingUtilities.java')
-rw-r--r-- | javax/swing/SwingUtilities.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/javax/swing/SwingUtilities.java b/javax/swing/SwingUtilities.java index a9113f0ff..159113288 100644 --- a/javax/swing/SwingUtilities.java +++ b/javax/swing/SwingUtilities.java @@ -97,8 +97,8 @@ public class SwingUtilities implements SwingConstants // view rect 'vr' already ok, // we need to compute ir (icon rect) and tr (text-rect) - int next_x = 0;//vr.x; - int next_y = 0;//vr.y; + int next_x = vr.x; + int next_y = vr.y; ir.height = ir.width = ir.y = ir.x = 0; @@ -115,10 +115,10 @@ public class SwingUtilities implements SwingConstants } tr.x = next_x; - tr.y = vr.y + (vr.height/2); + tr.y = vr.y; // + (vr.height/2); tr.width = fm.stringWidth(text); - tr.height = fm.getHeight() + fm.getAscent()/2; + tr.height = fm.getHeight(); // + fm.getAscent()/2; return text; } |