Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
8212904: JTextArea line wrapping incorrect when using UI scale
Reviewed-by: serb, prr
- Loading branch information
Showing
3 changed files
with
119 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
116 changes: 116 additions & 0 deletions
116
test/jdk/javax/swing/JTextArea/JTextAreaWordWrapTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,116 @@ | ||
/* | ||
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. | ||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
* | ||
* This code is free software; you can redistribute it and/or modify it | ||
* under the terms of the GNU General Public License version 2 only, as | ||
* published by the Free Software Foundation. | ||
* | ||
* This code is distributed in the hope that it will be useful, but WITHOUT | ||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
* version 2 for more details (a copy is included in the LICENSE file that | ||
* accompanied this code). | ||
* | ||
* You should have received a copy of the GNU General Public License version | ||
* 2 along with this work; if not, write to the Free Software Foundation, | ||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
* | ||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
* or visit www.oracle.com if you need additional information or have any | ||
* questions. | ||
*/ | ||
|
||
/* @test | ||
* @key headful | ||
* @bug 8212904 | ||
* @summary Verifies JTextArea line wrapping using UI scale | ||
* @run main JTextAreaWordWrapTest | ||
*/ | ||
import java.awt.BorderLayout; | ||
import java.awt.event.WindowAdapter; | ||
import java.awt.event.WindowEvent; | ||
import java.io.IOException; | ||
import java.net.URISyntaxException; | ||
import javax.swing.JFrame; | ||
import javax.swing.JScrollPane; | ||
import javax.swing.JTextArea; | ||
import javax.swing.ScrollPaneConstants; | ||
import javax.swing.SwingUtilities; | ||
|
||
public class JTextAreaWordWrapTest { | ||
|
||
static JFrame frame; | ||
static JFrame frame1; | ||
static JTextArea textArea; | ||
static JTextArea textArea1; | ||
|
||
public static void doWrapOnTest() { | ||
|
||
frame = new JFrame(); | ||
frame.setSize( 720, 300 ); | ||
frame.setLayout( new BorderLayout() ); | ||
|
||
textArea = new JTextArea(); | ||
textArea.setLineWrap( true ); | ||
textArea.setWrapStyleWord( true ); | ||
|
||
StringBuffer sb = new StringBuffer(); | ||
for (int i = 0; i < 100; i++) { | ||
sb.append( "zz zzz zzzz zz zz zz zzz xzzzz zzzzzzzzzzzzzzzzx yyyyyyy tttttttttt sssss hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh\n" ); | ||
} | ||
textArea.setText( sb.toString() ); | ||
JScrollPane pane = new JScrollPane( textArea, | ||
ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS, | ||
ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED ); | ||
frame.add( pane, BorderLayout.CENTER ); | ||
frame.setVisible( true ); | ||
|
||
} | ||
|
||
public static void doWrapOffTest() { | ||
frame1 = new JFrame(); | ||
frame1.setSize( 720, 300 ); | ||
frame1.setLayout( new BorderLayout() ); | ||
|
||
textArea1 = new JTextArea(); | ||
|
||
StringBuffer sb1 = new StringBuffer(); | ||
for (int i = 0; i < 100; i++) { | ||
sb1.append( "zz zzz zzzz zz zz zz zzz xzzzz zzzzzzzzzzzzzzzzx yyyyyyy tttttttttt sssss hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh\n" ); | ||
} | ||
textArea1.setText( sb1.toString() ); | ||
JScrollPane pane1 = new JScrollPane( textArea1, | ||
ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS, | ||
ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED ); | ||
frame1.add( pane1, BorderLayout.CENTER ); | ||
frame1.setLocationRelativeTo(null); | ||
frame1.setVisible( true ); | ||
} | ||
|
||
public static void main( String[] args ) throws Exception { | ||
System.setProperty( "sun.java2d.uiScale", "1.25" ); | ||
try { | ||
SwingUtilities.invokeAndWait(() -> doWrapOnTest()); | ||
Thread.sleep(500); | ||
SwingUtilities.invokeAndWait(() -> doWrapOffTest()); | ||
Thread.sleep(500); | ||
|
||
SwingUtilities.invokeAndWait(() -> { | ||
|
||
int wraponHeight = textArea.getHeight(); | ||
System.out.println("wraponheight " + wraponHeight); | ||
int wrapoffHeight = textArea1.getHeight(); | ||
System.out.println("wrapoffheight " + wrapoffHeight); | ||
|
||
if (wraponHeight == wrapoffHeight) { | ||
throw new RuntimeException("JTextArea line wrapping incorrect when using UI scale"); | ||
} | ||
}); | ||
|
||
} finally { | ||
SwingUtilities.invokeAndWait(() -> frame.dispose()); | ||
SwingUtilities.invokeAndWait(() -> frame1.dispose()); | ||
} | ||
} | ||
} |
702ee3d
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/backport jdk11u-dev
702ee3d
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mrserb the backport was successfully created on the branch mrserb-backport-702ee3db in my personal fork of openjdk/jdk11u-dev. To create a pull request with this backport targeting openjdk/jdk11u-dev:master, just click the following link:
➡️ Create pull request
The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:
If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk11u-dev: