summaryrefslogtreecommitdiffstats
path: root/libjava/java/awt/FlowLayout.java
diff options
context:
space:
mode:
authorfitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4>2003-10-08 23:38:45 +0000
committerfitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4>2003-10-08 23:38:45 +0000
commit0cd84e952f8a13b85433af21b4ab7cc4ea197dc1 (patch)
tree76a4f1fc8f638f10480fcb4655420078f47c600b /libjava/java/awt/FlowLayout.java
parent5614d3f5263e5274b68a12fa38cac703cdb4a4a3 (diff)
downloadppe42-gcc-0cd84e952f8a13b85433af21b4ab7cc4ea197dc1.tar.gz
ppe42-gcc-0cd84e952f8a13b85433af21b4ab7cc4ea197dc1.zip
2003-10-08 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GtkButtonPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c (gtkSetFont): Handle BOLD and ITALIC style specifiers. (gtkWidgetSetForeground): New method. * gnu/java/awt/peer/gtk/GtkComponentPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (gtkWidgetSetBackground, gtkWidgetSetForeground): New methods. (setBackground, setForeground): Implement. * gnu/java/awt/peer/gtk/GtkTextAreaPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c (gtkSetFont): Handle BOLD and ITALIC style specifiers. * gnu/java/awt/peer/gtk/GtkTextFieldPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c: Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c (drawString): Position PangoLayout relative to text's baseline. * jni/gtk-peer/gtkpeer.h: Define AWT font style constants. * java/awt/FlowLayout.java (layoutContainer): Fix offset problem for CENTER and RIGHT alignments. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@72246 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/awt/FlowLayout.java')
-rw-r--r--libjava/java/awt/FlowLayout.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/libjava/java/awt/FlowLayout.java b/libjava/java/awt/FlowLayout.java
index 795dfd8e61f..d26b8d13c2b 100644
--- a/libjava/java/awt/FlowLayout.java
+++ b/libjava/java/awt/FlowLayout.java
@@ -205,9 +205,9 @@ public class FlowLayout implements LayoutManager, Serializable
if (myalign == LEFT)
x = ins.left + hgap;
else if (myalign == CENTER)
- x = (d.width - new_w) / 2;
+ x = ins.left + (d.width - new_w) / 2 + hgap;
else
- x = d.width - new_w;
+ x = ins.left + (d.width - new_w) + hgap;
for (int k = i; k < j; ++k)
{
OpenPOWER on IntegriCloud