Skip to content
Permalink
Browse files
8239334: Tab Size does not work correctly in JTextArea with setLineWr…
…ap on

Backport-of: 3c72042
  • Loading branch information
Yuri Nesterenko committed Oct 18, 2021
1 parent 430dc46 commit f5c51d919fa9b87d24993f8c3dbf4130068f1044
Showing with 115 additions and 1 deletion.
  1. +1 −1 src/java.desktop/share/classes/javax/swing/text/WrappedPlainView.java
  2. +114 −0 test/jdk/javax/swing/JTextArea/TestTabSizeWithLineWrap.java
@@ -466,7 +466,7 @@ final void updateMetrics() {
public float nextTabStop(float x, int tabOffset) {
if (tabSize == 0)
return x;
float ntabs = (x - tabBase) / tabSize;
int ntabs = (int) ((x - tabBase) / tabSize);
return tabBase + ((ntabs + 1) * tabSize);
}

@@ -0,0 +1,114 @@
/*
* Copyright (c) 2020, 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
* @bug 8239334
* @summary Verifies Tab Size works correctly in JTextArea with setLineWrap on
* @key headful
* @run main TestTabSizeWithLineWrap
*/

import java.awt.geom.Rectangle2D;
import javax.swing.GroupLayout;
import javax.swing.JFrame;
import javax.swing.JScrollPane;
import javax.swing.JTextArea;
import javax.swing.SwingUtilities;
import javax.swing.text.BadLocationException;
import javax.swing.text.Caret;

public class TestTabSizeWithLineWrap {
private static JScrollPane jScrollPane1;
private static JTextArea jTextArea1;
private static JFrame f;
private static Rectangle2D rect;
private static Rectangle2D rect1;
private static boolean excpnthrown = false;

public static void main(String args[]) throws Exception {

SwingUtilities.invokeAndWait(() -> {
try {
jScrollPane1 = new JScrollPane();
jTextArea1 = new JTextArea();
jTextArea1.setTabSize(8);
f = new JFrame();

jTextArea1.setFont(new java.awt.Font("Monospaced", 0, 10));
jTextArea1.setLineWrap( true );
String str =
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!#\n"
+ "! Some Text\t\t\t\t\t#";
jTextArea1.setText(str);
jScrollPane1.setViewportView(jTextArea1);

GroupLayout layout = new javax.swing.GroupLayout(f.getContentPane());
f.getContentPane().setLayout(layout);
layout.setHorizontalGroup(
layout.createParallelGroup(
javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addContainerGap()
.addComponent(jScrollPane1,
javax.swing.GroupLayout.DEFAULT_SIZE,
446, Short.MAX_VALUE)
.addContainerGap())
);
layout.setVerticalGroup(
layout.createParallelGroup(
javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addContainerGap()
.addComponent(jScrollPane1)
.addContainerGap())
);

f.pack();
int first = str.indexOf("#");
jTextArea1.setCaretPosition(first);
Caret caret = jTextArea1.getCaret();
rect = jTextArea1.modelToView2D(caret.getDot());
System.out.println("caret x position " + rect.getX());

jTextArea1.setCaretPosition(str.indexOf("#", first+1));
caret = jTextArea1.getCaret();
rect1 = jTextArea1.modelToView2D(caret.getDot());
System.out.println("2nd caret x position " + rect1.getX());

} catch (BadLocationException ex) {
excpnthrown = true;
} finally {
if (f != null) {
f.dispose();
}
}
});
if (excpnthrown) {
throw new RuntimeException("BadLocationException thrown");
}
if ((int)rect.getX() != (int)rect1.getX()) {
throw new RuntimeException("Tab width calculation wrong");
}
}
}

1 comment on commit f5c51d9

@openjdk-notifier

This comment has been minimized.

Copy link

@openjdk-notifier openjdk-notifier bot commented on f5c51d9 Oct 18, 2021

Please sign in to comment.