[cp-patches] Cosmetic spinner fixes

[Sven de Marothy]

2006-04-27  Sven de Marothy <[EMAIL PROTECTED]>

        * javax/swing/JSpinner.java: Fix default text justification.
        * javax/swing/plaf/basic/BasicSpinnerUI.java: Fix spinner layout size.

-- 
Sven de Marothy <[EMAIL PROTECTED]>

Index: javax/swing/JSpinner.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/JSpinner.java,v
retrieving revision 1.15
diff -U3 -r1.15 JSpinner.java
--- javax/swing/JSpinner.java	15 Feb 2006 16:20:13 -0000	1.15
+++ javax/swing/JSpinner.java	27 Apr 2006 15:06:56 -0000
@@ -106,6 +106,10 @@
       add(ftf);
       ftf.setValue(spinner.getValue());
       ftf.addPropertyChangeListener(this);
+      if(getComponentOrientation().isLeftToRight())
+	ftf.setHorizontalAlignment(JTextField.RIGHT);
+      else
+	ftf.setHorizontalAlignment(JTextField.LEFT);
       spinner.addChangeListener(this);
     }
 
Index: javax/swing/plaf/basic/BasicSpinnerUI.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/plaf/basic/BasicSpinnerUI.java,v
retrieving revision 1.9
diff -U3 -r1.9 BasicSpinnerUI.java
--- javax/swing/plaf/basic/BasicSpinnerUI.java	20 Apr 2006 19:21:08 -0000	1.9
+++ javax/swing/plaf/basic/BasicSpinnerUI.java	27 Apr 2006 15:06:57 -0000
@@ -364,9 +364,9 @@
   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 @@
           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)