Hi,

I fixed the BasicComboPopup a little so that it comes up with the correct
size and borders.

2005-11-14  Roman Kennke  <[EMAIL PROTECTED]>

        * javax/swing/plaf/basic/BasicComboPopup.java
        (show): Instead of fiddling with the list size, set the
preferredSize
        of the scroller.
        (configureScroller): Set border to null.
        (configurePopup): Set border correctly.

/Roman
Index: javax/swing/plaf/basic/BasicComboPopup.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicComboPopup.java,v
retrieving revision 1.10
diff -u -r1.10 BasicComboPopup.java
--- javax/swing/plaf/basic/BasicComboPopup.java	17 Oct 2005 15:22:50 -0000	1.10
+++ javax/swing/plaf/basic/BasicComboPopup.java	14 Nov 2005 12:42:14 -0000
@@ -38,6 +38,7 @@
 
 package javax.swing.plaf.basic;
 
+import java.awt.Color;
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.Insets;
@@ -56,6 +57,7 @@
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 
+import javax.swing.BorderFactory;
 import javax.swing.ComboBoxModel;
 import javax.swing.JComboBox;
 import javax.swing.JLabel;
@@ -179,11 +181,8 @@
     // to display number of rows equal to 'maximumRowCount' property
     int popupHeight = getPopupHeightForRowCount(comboBox.getMaximumRowCount());
 
-    list.setPreferredSize(new Dimension(cbBounds.width, popupHeight));
-    Insets insets1 = getInsets();
-    Insets insets2 = scroller.getInsets();
-    super.setPopupSize(cbBounds.width, popupHeight + insets1.top 
-            + insets1.bottom + insets2.top + insets2.bottom);
+    scroller.setPreferredSize(new Dimension(cbBounds.width, popupHeight));
+    pack();
 
     // Highlight selected item in the combo box's drop down list
     if (comboBox.getSelectedIndex() != -1)
@@ -482,6 +481,7 @@
    */
   protected void configureScroller()
   {
+    scroller.setBorder(null);
     scroller.getViewport().setView(list);
     scroller.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
   }
@@ -492,6 +492,7 @@
    */
   protected void configurePopup()
   {
+    setBorder(BorderFactory.createLineBorder(Color.BLACK));
     // initialize list that will be used to display combo box's items
     this.list = createList();
     ((JLabel) list.getCellRenderer()).setHorizontalAlignment(SwingConstants.LEFT);
_______________________________________________
Classpath-patches mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/classpath-patches

Reply via email to