stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8098835: [PIT] Endless loop in JEditorPane

Browse Source 
Reviewed-by: alexsch, serb
This commit is contained in:
Semyon Sadetsky 2015-07-10 21:19:41 +03:00
parent ddced53edf
commit 318513bcf7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java
View File

@ -971,7 +971,7 @@ public abstract class BasicTextUI extends TextUI implements ViewFactory {
((AbstractDocument)doc).readLock(); ((AbstractDocument)doc).readLock();
} }
try { try {
d.width = (int) rootView.getMinimumSpan(View.X_AXIS) + i.left + i.right; d.width = (int) rootView.getMinimumSpan(View.X_AXIS) + i.left + i.right + caretMargin;
d.height = (int) rootView.getMinimumSpan(View.Y_AXIS) + i.top + i.bottom; d.height = (int) rootView.getMinimumSpan(View.Y_AXIS) + i.top + i.bottom;
} finally { } finally {
if (doc instanceof AbstractDocument) { if (doc instanceof AbstractDocument) {
@ -996,7 +996,7 @@ public abstract class BasicTextUI extends TextUI implements ViewFactory {
} }
try { try {
d.width = (int) Math.min((long) rootView.getMaximumSpan(View.X_AXIS) + d.width = (int) Math.min((long) rootView.getMaximumSpan(View.X_AXIS) +
(long) i.left + (long) i.right, Integer.MAX_VALUE); (long) i.left + (long) i.right + caretMargin, Integer.MAX_VALUE);
d.height = (int) Math.min((long) rootView.getMaximumSpan(View.Y_AXIS) + d.height = (int) Math.min((long) rootView.getMaximumSpan(View.Y_AXIS) +
(long) i.top + (long) i.bottom, Integer.MAX_VALUE); (long) i.top + (long) i.bottom, Integer.MAX_VALUE);
} finally { } finally {
@ -1027,7 +1027,7 @@ public abstract class BasicTextUI extends TextUI implements ViewFactory {
Insets insets = editor.getInsets(); Insets insets = editor.getInsets();
alloc.x += insets.left; alloc.x += insets.left;
alloc.y += insets.top; alloc.y += insets.top;
alloc.width -= insets.left + insets.right; alloc.width -= insets.left + insets.right + caretMargin;
alloc.height -= insets.top + insets.bottom; alloc.height -= insets.top + insets.bottom;
return alloc; return alloc;
} }