2005-04-19 Roman Kennke <roman@kennke.org>

	* javax/swing/plaf/basic/BasicMenuUI.java
	(getMaximumSize): Now returns preferredSize because JMenu should
	never be bigger than that.
	* javax/swing/JRootPane
	(RootLayout.layoutContainer): Make JMenuBars take the whole width.

2005-04-19  Roman Kennke  <roman@kennke.org>

	* javax/swing/JRootPane.java:
	Fixed various tabs to be spaces.
	(RootLayout.layoutContainer): Made menubar left aligned.

From-SVN: r98386

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 88bae2057a7996163eeaec4a11f1bcaf8f6d2f9f..17dbed8850fa6440dcf594a5205336a0131e7e5f 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,17 @@
+2005-04-19  Roman Kennke  <roman@kennke.org>
+
+       * javax/swing/plaf/basic/BasicMenuUI.java
+       (getMaximumSize): Now returns preferredSize because JMenu should
+       never be bigger than that.
+       * javax/swing/JRootPane
+       (RootLayout.layoutContainer): Make JMenuBars take the whole width.
+
+2005-04-19  Roman Kennke  <roman@kennke.org>
+
+       * javax/swing/JRootPane.java:
+       Fixed various tabs to be spaces.
+       (RootLayout.layoutContainer): Made menubar left aligned.
+
 2005-04-19  Roman Kennke  <roman@ontographics.com>
 
        * javax/swing/JList.java

diff --git a/libjava/javax/swing/JRootPane.java b/libjava/javax/swing/JRootPane.java
index 145750758a439b5c9337ef1c5a94caff7f71deae..ee05d27f9ea88d6438acca127ad6308bbf6ce9dd 100644 (file)
--- a/libjava/javax/swing/JRootPane.java
+++ b/libjava/javax/swing/JRootPane.java
@@ -189,52 +189,52 @@ public class JRootPane extends JComponent
       */
       if (containerSize.width == 0 && containerSize.height == 0)
         {
-         if (menuBar != null)
-           {
-             int maxWidth;
-             menuBarSize = menuBar.getPreferredSize();
-             maxWidth = Math.max(menuBarSize.width, contentPaneSize.width);
-             menuBar.setBounds(0, 0, maxWidth, menuBarSize.height);
-             glassPane.setBounds(0, menuBarSize.height, maxWidth,
-                                 contentPaneSize.height);
-             contentPane.setBounds(0, menuBarSize.height, maxWidth,
-                                   contentPaneSize.height);
-             layeredPane.setSize(maxWidth,
-                                 menuBarSize.height + contentPaneSize.height);
-           }
-         else
-           {
-             glassPane.setBounds(0, 0, contentPaneSize.width,
-                                 contentPaneSize.height);
-             contentPane.setBounds(0, 0, contentPaneSize.width,
-                                   contentPaneSize.height);
-             layeredPane.setSize(contentPaneSize.width, contentPaneSize.height);
-           }
+          if (menuBar != null)
+            {
+              int maxWidth;
+              menuBarSize = menuBar.getPreferredSize();
+              maxWidth = Math.max(menuBarSize.width, contentPaneSize.width);
+              menuBar.setBounds(0, 0, maxWidth, menuBarSize.height);
+              glassPane.setBounds(0, menuBarSize.height, maxWidth,
+                                  contentPaneSize.height);
+              contentPane.setBounds(0, menuBarSize.height, maxWidth,
+                                    contentPaneSize.height);
+              layeredPane.setSize(maxWidth,
+                                  menuBarSize.height + contentPaneSize.height);
+            }
+          else
+            {
+              glassPane.setBounds(0, 0, contentPaneSize.width,
+                                  contentPaneSize.height);
+              contentPane.setBounds(0, 0, contentPaneSize.width,
+                                    contentPaneSize.height);
+              layeredPane.setSize(contentPaneSize.width, contentPaneSize.height);
+            }
         }
       else
         {
-         if (menuBar != null)
-           {
-             menuBarSize = menuBar.getPreferredSize();
-             if (menuBarSize.height > containerSize.height)
-               menuBarSize.height = containerSize.height;
-             menuBar.setBounds(0, 0, containerSize.width, menuBarSize.height);
-             int remainingHeight = containerSize.height - menuBarSize.height;
-             glassPane.setBounds(0, menuBarSize.height, containerSize.width,
-                                 containerSize.height - menuBarSize.height);
-             contentPane.setBounds(0, menuBarSize.height,
-                                   containerSize.width,
-                                   (containerSize.height - menuBarSize.height));
-           }
-         else
-           {
-             glassPane.setBounds(0, 0, containerSize.width,
-                                 containerSize.height);
-             contentPane.setBounds(0, 0, containerSize.width,
-                                   containerSize.height);
-           }
-
-         layeredPane.setSize(containerSize.width, containerSize.height);
+          if (menuBar != null)
+            {
+              menuBarSize = menuBar.getPreferredSize();
+              if (menuBarSize.height > containerSize.height)
+                menuBarSize.height = containerSize.height;
+              menuBar.setBounds(0, 0, containerSize.width, menuBarSize.height);
+              int remainingHeight = containerSize.height - menuBarSize.height;
+              glassPane.setBounds(0, menuBarSize.height, containerSize.width,
+                                  containerSize.height - menuBarSize.height);
+              contentPane.setBounds(0, menuBarSize.height,
+                                    containerSize.width,
+                                    (containerSize.height - menuBarSize.height));
+            }
+          else
+            {
+              glassPane.setBounds(0, 0, containerSize.width,
+                                  containerSize.height);
+              contentPane.setBounds(0, 0, containerSize.width,
+                                    containerSize.height);
+            }
+
+          layeredPane.setSize(containerSize.width, containerSize.height);
         }
     }
 
@@ -279,20 +279,20 @@ public class JRootPane extends JComponent
 
       if (containerSize.width == 0 && containerSize.height == 0)
         {
-         if (menuBar != null)
-           {
-             int maxWidth;
-             menuBarSize = menuBar.getPreferredSize();
-             maxWidth = Math.max(menuBarSize.width, contentPaneSize.width);
-             prefSize = new Dimension(maxWidth,
-                                      contentPaneSize.height
-                                      + menuBarSize.height);
-           }
-         else
-           prefSize = contentPaneSize;
+          if (menuBar != null)
+            {
+              int maxWidth;
+              menuBarSize = menuBar.getPreferredSize();
+              maxWidth = Math.max(menuBarSize.width, contentPaneSize.width);
+              prefSize = new Dimension(maxWidth,
+                                       contentPaneSize.height
+                                       + menuBarSize.height);
+            }
+          else
+            prefSize = contentPaneSize;
         }
       else
-       prefSize = c.getSize();
+        prefSize = c.getSize();
 
       return prefSize;
     }
@@ -319,7 +319,7 @@ public class JRootPane extends JComponent
   public static final int FILE_CHOOSER_DIALOG = 6;
   public static final int QUESTION_DIALOG = 7;
   public static final int WARNING_DIALOG = 8;
-         
+          
   /** DOCUMENT ME! */
   protected Component glassPane;
 
@@ -609,13 +609,13 @@ public class JRootPane extends JComponent
   public void setWindowDecorationStyle(int style)
   {
     if (style != NONE
-       && style != FRAME
-       && style != INFORMATION_DIALOG
-       && style != ERROR_DIALOG
-       && style != COLOR_CHOOSER_DIALOG
-       && style != FILE_CHOOSER_DIALOG
-       && style != QUESTION_DIALOG
-       && style != WARNING_DIALOG)
+        && style != FRAME
+        && style != INFORMATION_DIALOG
+        && style != ERROR_DIALOG
+        && style != COLOR_CHOOSER_DIALOG
+        && style != FILE_CHOOSER_DIALOG
+        && style != QUESTION_DIALOG
+        && style != WARNING_DIALOG)
       throw new IllegalArgumentException("invalid style");
     
     int oldStyle = windowDecorationStyle;

diff --git a/libjava/javax/swing/plaf/basic/BasicMenuUI.java b/libjava/javax/swing/plaf/basic/BasicMenuUI.java
index 7cd16f9e75ec8e335bffffce825e69b0dc2611bd..932024aa9a8a44f2f51af957d68b3220cc98214e 100644 (file)
--- a/libjava/javax/swing/plaf/basic/BasicMenuUI.java
+++ b/libjava/javax/swing/plaf/basic/BasicMenuUI.java
@@ -179,7 +179,7 @@ public class BasicMenuUI extends BasicMenuItemUI
    */
   public Dimension getMaximumSize(JComponent c)
   {
-    return null;
+    return c.getPreferredSize();
   }
 
   protected String getPropertyPrefix()