From a5586c386574da2397048bf12b0793a23db405a7 Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Wed, 8 Oct 2003 23:38:45 +0000 Subject: 2003-10-08 Thomas Fitzsimmons * 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. From-SVN: r72246 --- libjava/java/awt/FlowLayout.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libjava/java/awt/FlowLayout.java') diff --git a/libjava/java/awt/FlowLayout.java b/libjava/java/awt/FlowLayout.java index 795dfd8..d26b8d1 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) { -- cgit v1.1