From: Thomas Fitzsimmons <fitzsim@redhat.com>
Date: Fri, 19 Dec 2003 20:11:56 +0000 (+0000)
Subject: FlowLayout.java (layoutContainer): Let components assume their preferred height.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a0687c1fbcf51f8aec14b4bcbbf4cdd7c111be2c;p=gcc.git

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 8db6d7373a3..a50b34ee35e 100644
--- 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 d26b8d13c2b..98d74941ea8 100644
--- 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;
 		  }
 	      }