8232243: Wrong caret position in JTextPane on Windows with a screen resolution > 100%

Backport-of: ddb1d7a

Author: TheRealMDoerr

src/java.desktop/share/classes/javax/swing/text/GlyphPainter1.java

@@ -176,8 +176,7 @@ public int viewToModel(GlyphView v, float x, float y, Shape a,
 Segmenttext = v.getText(p0, p1);
 int[] justificationData = getJustificationData(v);
 intoffs = Utilities.getTabbedTextOffset(v, text, metrics,
-alloc.x, (int) x, expander, p0,
-justificationData);
+ (float)alloc.x, x, expander, p0, justificationData);
 SegmentCache.releaseSharedSegment(text);
 intretValue = p0 + offs;
 if(retValue == p1) {

src/java.desktop/share/classes/javax/swing/text/Utilities.java

@@ -398,6 +398,14 @@ static final int getTabbedTextOffset(View view, Segment s, FontMetrics metrics,
 justificationData, false);
  }
 
+staticfinalintgetTabbedTextOffset(Viewview, Segments, FontMetricsmetrics,
+floatx0, floatx, TabExpandere,
+intstartOffset,
+int[] justificationData) {
+returngetTabbedTextOffset(view, s, metrics, x0, x, e, startOffset, true,
+justificationData, true);
+ }
+
 /**
  * Determines the relative offset into the given text that
  * best represents the given span in the view coordinate

test/jdk/javax/swing/text/Caret/TestCaretPositionJTextPane.java

@@ -0,0 +1,128 @@
+/*
+ * 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 8232243
+ * @key headful
+ * @summary Verifies caret position in multiline JTextPane
+ * in hidpi mode should be in sync with mouse press position.
+ * @run main/othervm -Dsun.java2d.uiScale=2 TestCaretPositionJTextPane
+ */
+
+importjavax.swing.JComboBox;
+importjavax.swing.JTextPane;
+importjavax.swing.JFrame;
+importjavax.swing.JScrollPane;
+importjavax.swing.SwingUtilities;
+importjavax.swing.text.BadLocationException;
+importjavax.swing.text.Caret;
+importjava.awt.Font;
+importjava.awt.BorderLayout;
+importjava.awt.Point;
+importjava.awt.Robot;
+importjava.awt.event.InputEvent;
+importjava.awt.event.MouseEvent;
+importjava.awt.event.MouseListener;
+importjava.awt.geom.Rectangle2D;
+
+publicclassTestCaretPositionJTextPane {
+privatestaticJTextPanetextPane;
+privatestaticJFramef;
+
+privatestaticvoidcreateUI() {
+f = newJFrame("Test Cursor/Caret with Java 9");
+
+textPane = newJTextPane();
+textPane.setFont(newjava.awt.Font("Dialog", Font.PLAIN, 12));
+
+fillTextPane(textPane);
+
+textPane.addMouseListener(newMouseListener() {
+@Override
+publicvoidmouseClicked(MouseEvente) {}
+
+@Override
+publicvoidmousePressed(MouseEvente) {
+try {
+Caretcaret = textPane.getCaret();
+Rectangle2Drect = textPane.modelToView2D(caret.getDot());
+
+if (Math.abs(e.getPoint().x - rect.getX()) > 5) {
+System.out.println("mouse point " + e.getPoint());
+System.out.println("caret position " + rect);
+thrownewRuntimeException(" Wrong caret position");
+ }
+ } catch (BadLocationExceptionex) {}
+ }
+
+@Override
+publicvoidmouseReleased(MouseEvente) {}
+
+@Override
+publicvoidmouseEntered(MouseEvente) {}
+
+@Override
+publicvoidmouseExited(MouseEvente) {}
+ });
+f.add(newJScrollPane(textPane), BorderLayout.CENTER);
+f.pack();
+f.setVisible(true);
+ }
+
+publicstaticvoidmain(Stringargs[]) throwsException {
+try {
+Robotrobot = newRobot();
+robot.setAutoDelay(200);
+
+SwingUtilities.invokeAndWait(() -> createUI());
+
+robot.waitForIdle();
+Pointp = textPane.getLocationOnScreen();
+robot.mouseMove(p.x+ 480, p.y+6);
+robot.waitForIdle();
+robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+robot.waitForIdle();
+robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+robot.waitForIdle();
+ } finally {
+SwingUtilities.invokeAndWait(() -> f.dispose());
+ }
+ }
+
+privatestaticvoidfillTextPane(JTextPanetextPane) {
+StringBuilderbuf = newStringBuilder();
+
+for (inti = 0; i < 30; i++) {
+StringBuilderrow = newStringBuilder();
+for (intj = 0; j < 50; j++) {
+row.append(j);
+if (j % 5 == 0) {
+row.append(" ");
+ }
+ }
+buf.append(row).append(System.lineSeparator());
+ }
+textPane.setText(buf.toString());
+textPane.setCaretPosition(0);
+ }
+}