JTextArea better row height calculation for preferred size

hansonr · hansonr · commit 750d7132ac06 · 2019-02-28T16:04:01.000-06:00
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/JTextArea.java b/sources/net.sf.j2s.java.core/src/javax/swing/JTextArea.java
@@ -563,7 +563,7 @@ public void setRows(int rows) {
     protected int getRowHeight() {
         if (rowHeight == 0) {
             FontMetrics metrics = getFontMetrics(getFont());
-            rowHeight = metrics.getHeight();
+            rowHeight = metrics.getHeight() + 2; // SwingJS adds +2 here
         }
         return rowHeight;
     }
@@ -643,7 +643,7 @@ public Dimension getSizeJS(Dimension d, int n, int rows, int columns) {
 		}
 		if (rows != 0) {
 			Insets insets = getInsets();
-			d.height = Math.max(h, rows * getRowHeight() + insets.top + insets.bottom);
+			d.height = Math.max(h, (rows + 1) * getRowHeight() + insets.top + insets.bottom);
 		}
 		return d;
 	}

Original file line number	Diff line number	Diff line change
`@@ -563,7 +563,7 @@ public void setRows(int rows) {`
`563`	`563`	`protected int getRowHeight() {`
`564`	`564`	`if (rowHeight == 0) {`
`565`	`565`	`FontMetrics metrics = getFontMetrics(getFont());`
`566`		`- rowHeight = metrics.getHeight();`
	`566`	`+ rowHeight = metrics.getHeight() + 2; // SwingJS adds +2 here`
`567`	`567`	`}`
`568`	`568`	`return rowHeight;`
`569`	`569`	`}`
`@@ -643,7 +643,7 @@ public Dimension getSizeJS(Dimension d, int n, int rows, int columns) {`
`643`	`643`	`}`
`644`	`644`	`if (rows != 0) {`
`645`	`645`	`Insets insets = getInsets();`
`646`		`- d.height = Math.max(h, rows * getRowHeight() + insets.top + insets.bottom);`
	`646`	`+ d.height = Math.max(h, (rows + 1) * getRowHeight() + insets.top + insets.bottom);`
`647`	`647`	`}`
`648`	`648`	`return d;`
`649`	`649`	`}`