diff options
| author | Sven de Marothy <sven@physto.se> | 2006-04-28 17:35:16 +0000 |
|---|---|---|
| committer | Sven de Marothy <sven@physto.se> | 2006-04-28 17:35:16 +0000 |
| commit | f0d7b1d6ae0217e5b5a9ac53a4af10892afbd3c0 (patch) | |
| tree | 8b69352d79c46ac4aac0fc7bc58cc4319fa25390 | |
| parent | 3e55a29a1506bff36de7a0e392c091cc915d2700 (diff) | |
| download | classpath-f0d7b1d6ae0217e5b5a9ac53a4af10892afbd3c0.tar.gz | |
2006-04-28 Sven de Marothy <sven@physto.se>
* javax/swing/JSpinner.java: Fix default text justification.
* javax/swing/plaf/basic/BasicSpinnerUI.java: Fix spinner layout size.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | javax/swing/JSpinner.java | 4 | ||||
| -rw-r--r-- | javax/swing/plaf/basic/BasicSpinnerUI.java | 8 |
3 files changed, 13 insertions, 4 deletions
@@ -1,3 +1,8 @@ +2006-04-28 Sven de Marothy <sven@physto.se> + + * javax/swing/JSpinner.java: Fix default text justification. + * javax/swing/plaf/basic/BasicSpinnerUI.java: Fix spinner layout size. + 2006-04-28 David Gilbert <david.gilbert@object-refinery.com> * javax/swing/JList.java diff --git a/javax/swing/JSpinner.java b/javax/swing/JSpinner.java index 882d216e1..70045ed53 100644 --- a/javax/swing/JSpinner.java +++ b/javax/swing/JSpinner.java @@ -106,6 +106,10 @@ public class JSpinner extends JComponent add(ftf); ftf.setValue(spinner.getValue()); ftf.addPropertyChangeListener(this); + if(getComponentOrientation().isLeftToRight()) + ftf.setHorizontalAlignment(JTextField.RIGHT); + else + ftf.setHorizontalAlignment(JTextField.LEFT); spinner.addChangeListener(this); } diff --git a/javax/swing/plaf/basic/BasicSpinnerUI.java b/javax/swing/plaf/basic/BasicSpinnerUI.java index 433a6a2c2..465374bfd 100644 --- a/javax/swing/plaf/basic/BasicSpinnerUI.java +++ b/javax/swing/plaf/basic/BasicSpinnerUI.java @@ -364,9 +364,9 @@ public class BasicSpinnerUI extends SpinnerUI private class DefaultLayoutManager implements LayoutManager { /** - * DOCUMENT ME! + * Layout the spinners inner parts. * - * @param parent DOCUMENT ME! + * @param parent The parent container */ public void layoutContainer(Container parent) { @@ -384,12 +384,12 @@ public class BasicSpinnerUI extends SpinnerUI Dimension e = prefSize(editor); Dimension n = prefSize(next); Dimension p = prefSize(previous); - Dimension s = spinner.getPreferredSize(); + Dimension s = parent.getSize(); int x = l2r ? i.left : i.right; int y = i.top; int w = Math.max(p.width, n.width); - int h = e.height / 2; + int h = (s.height - i.bottom) / 2; int e_width = s.width - w - i.left - i.right; if (l2r) |