diff options
| author | Roman Kennke <roman@kennke.org> | 2005-04-25 19:36:43 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2005-04-25 19:36:43 +0000 |
| commit | 8efae6bbfa04f662589bbfc64dbbe68935f973d2 (patch) | |
| tree | 6a73f30784c260b998e5fb2e421b3c002d8ff608 /libjava/javax/swing/BoxLayout.java | |
| parent | 9f62c3e3ed53732a8fe755ad5109c1a6ed25bb0c (diff) | |
| download | gcc-8efae6bbfa04f662589bbfc64dbbe68935f973d2.zip gcc-8efae6bbfa04f662589bbfc64dbbe68935f973d2.tar.gz gcc-8efae6bbfa04f662589bbfc64dbbe68935f973d2.tar.bz2 | |
2005-04-25 Roman Kennke <roman@kennke.org>
* javax/swing/plaf/basic/BasicScrollBarUI.java
(initDefaults): Initialize thumb*Color fields correctly.
2005-04-25 Roman Kennke <roman@kennke.org>
* javax/swing/text/GapContent.java:
Added API comments.
2005-04-25 Roman Kennke <roman@kennke.org>
* javax/swing/plaf/metal/MetalBorders.java:
Added inner class ScrollPaneBorder.
* javax/swing/plaf/metal/MetalLookAndFeel.java
(initComponentDefaults): Added default for "ScrollPane.border"
to use the new ScrollPaneBorder.
2005-04-25 Roman Kennke <roman@kennke.org>
* javax/swing/text/AbstractDocument.java:
Added FIXME comments. This class still has to be
implemented thread-safe.
2005-04-25 Roman Kennke <roman@kennke.org>
* javax/swing/tree/DefaultTreeSelectionModel.java
(DefaultTreeSelectionModel): Initialize listenerList here.
2005-04-25 Roman Kennke <roman@kennke.org>
* javax/swing/plaf/metal/MetalTextFieldUI.java
(createUI): Return one instance per Component instead of a
shared instance.
2005-04-25 Roman Kennke <roman@kennke.org>
* javax/swing/text/Document.java:
Added API documentation comments.
2005-04-25 Roman Kennke <roman@kennke.org>
* javax/swing/text/AbstractDocument.java
(getDocumentProperties): Implemented.
(setDocumentProperties): Implemented.
(getProperty): Implemented.
(putProperty): Implemented.
2005-04-25 Roman Kennke <roman@kennke.org>
* javax/swing/BoxLayout
(preferredLayoutSize): Fixed computation so that it correctly
adds the top and bottom insets of the container.
2005-04-25 Roman Kennke <roman@kennke.org>
* javax/swing/plaf/basic/BasicMenuItemUI.java
(paintText): Make use of the 'selectionForeground' UI default
for text painting.
2005-04-25 Roman Kennke <roman@kennke.org>
* javax/swing/plaf/basic/BasicLookAndFeel.java
(initSystemColorDefaults): Modified colors to match the
BasicLookAndFeel in the reference implementation.
(initComponentDefaults): Likewise.
From-SVN: r98733
Diffstat (limited to 'libjava/javax/swing/BoxLayout.java')
| -rw-r--r-- | libjava/javax/swing/BoxLayout.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libjava/javax/swing/BoxLayout.java b/libjava/javax/swing/BoxLayout.java index 384eb69..1edffe1 100644 --- a/libjava/javax/swing/BoxLayout.java +++ b/libjava/javax/swing/BoxLayout.java @@ -148,13 +148,14 @@ public class BoxLayout implements LayoutManager2, Serializable throw new AWTError("invalid parent"); Insets insets = parent.getInsets(); - int x = insets.left + insets.right; - int y = insets.bottom + insets.top; + int x = 0; + int y = 0; Component[] children = parent.getComponents(); if (isHorizontalIn(parent)) { + x = insets.left + insets.right; // sum up preferred widths of components, find maximum of preferred // heights for (int index = 0; index < children.length; index++) @@ -164,9 +165,11 @@ public class BoxLayout implements LayoutManager2, Serializable x += sz.width; y = Math.max(y, sz.height); } + y += insets.bottom + insets.top; } else { + y = insets.top + insets.bottom; // sum up preferred heights of components, find maximum of // preferred widths for (int index = 0; index < children.length; index++) @@ -176,8 +179,9 @@ public class BoxLayout implements LayoutManager2, Serializable y += sz.height; x = Math.max(x, sz.width); } + x += insets.left + insets.right; } - + return new Dimension(x, y); } |