FlowLayout.java (layoutContainer): Let components assume their preferred height.

2003-12-19  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* java/awt/FlowLayout.java (layoutContainer): Let components
	assume their preferred height.  Centre components vertically.

From-SVN: r74844

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 8db6d7373a3846599695fab817e455f5d68afe21..a50b34ee35ee633a73fbae77c696478ade0ddb59 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-19  Thomas Fitzsimmons  <fitzsim@redhat.com>
+
+       * java/awt/FlowLayout.java (layoutContainer): Let components
+       assume their preferred height.  Centre components vertically.
+
 2003-12-19  Michael Koch  <konqueror@gmx.de>
 
        * gnu/java/nio/ChannelInputStream.java: New file.

diff --git a/libjava/java/awt/FlowLayout.java b/libjava/java/awt/FlowLayout.java
index d26b8d13c2bc5215427ff1cfc570e8ebe050e7ab..98d74941ea8740c65dfd88501793531fe6359587 100644 (file)
--- a/libjava/java/awt/FlowLayout.java
+++ b/libjava/java/awt/FlowLayout.java
@@ -214,7 +214,8 @@ public class FlowLayout implements LayoutManager, Serializable
                if (comps[k].visible)
                  {
                    Dimension c = comps[k].getPreferredSize ();
-                   comps[k].setBounds (x, y, c.width, new_h);
+                   comps[k].setBounds (x, y + (new_h - c.height) / 2,
+                                       c.width, c.height);
                    x += c.width + hgap;
                  }
              }