In JTextField.getPreferredSize() we must include the textfield's insets,
otherwise we might get strange layouts.
2006-01-31 Roman Kennke <[EMAIL PROTECTED]>
* javax/swing/JTextField.java
(getPreferredSize): Also include textfield's insets in width
calculation.
/Roman
Index: javax/swing/JTextField.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JTextField.java,v
retrieving revision 1.28
diff -u -r1.28 JTextField.java
--- javax/swing/JTextField.java 12 Jan 2006 20:07:35 -0000 1.28
+++ javax/swing/JTextField.java 1 Feb 2006 15:24:17 -0000
@@ -41,6 +41,7 @@
import java.awt.Dimension;
import java.awt.Font;
import java.awt.FontMetrics;
+import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.beans.PropertyChangeEvent;
@@ -352,7 +353,10 @@
Dimension size = super.getPreferredSize();
if (columns != 0)
- size.width = columns * getColumnWidth();
+ {
+ Insets i = getInsets();
+ size.width = columns * getColumnWidth() + i.left + i.right;
+ }
return size;
}