From 56bba8cf57d0aa75d0266486595efe0d070af0b7 Mon Sep 17 00:00:00 2001 From: Hans Boehm Date: Wed, 19 Feb 2003 00:35:35 +0000 Subject: XToolkit.java (getFontMetrics): initialize if necessary. 2003-02-18 Hans Boehm * gnu/awt/xlib/XToolkit.java (getFontMetrics): initialize if necessary. * gnu/java/awt/peer/gtk/GtkButtonPeer.java, gnu/java/awt/peer/gtk/GtkTextAreaPeer.java, gnu/java/awt/peer/gtk/GtkTextFieldPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c (setFont, gtkSetFont): add. gnu/java/awt/peer/gtk/GtkComponentPeer.java (GtkComponentPeer): Propagate font to peer. (setFont): add FIXME comment. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c (gtkTextGetSize): fix height, width computation. * gnu/java/awt/peer/gtk/GtkFontPeer.java (GtkFontPeer): Make X font name a bit less bogus. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c (post_adjustment_event): Pass on GTK_SCROLL_NONE. * java/awt/Scrollbar.java (setValues): Fix visibleAmount range check. (processAdjustmentEvent): Adjust value. * java/awt/FlowLayout.java (layoutContainer) Fix 2 indexing and one logic errors. * java/awt/Component.java (setVisible, show, hide): Call show and hide methods in subclasses. (getPreferredSize): don't set prefSize before we have peer. * java/awt/TextArea.java, java/awt/TextField.java (getPreferredSize): Guess (0,0) if we don't have peer. From-SVN: r63077 --- libjava/java/awt/FlowLayout.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libjava/java/awt/FlowLayout.java') diff --git a/libjava/java/awt/FlowLayout.java b/libjava/java/awt/FlowLayout.java index 1f9465e..795dfd8 100644 --- a/libjava/java/awt/FlowLayout.java +++ b/libjava/java/awt/FlowLayout.java @@ -171,13 +171,13 @@ public class FlowLayout implements LayoutManager, Serializable int new_h = 0; int j; boolean found_one = false; - for (j = i; j < num && ! found_one; ++j) + for (j = i; j < num; ++j) { // Skip invisible items. - if (! comps[i].visible) + if (! comps[j].visible) continue; - Dimension c = comps[i].getPreferredSize (); + Dimension c = comps[j].getPreferredSize (); int next_w = new_w + hgap + c.width; if (next_w <= d.width || ! found_one) -- cgit v1.1