--- old/src/java.desktop/share/classes/javax/swing/text/GlyphPainter1.java 2017-11-01 10:58:08.185980900 +0530
+++ new/src/java.desktop/share/classes/javax/swing/text/GlyphPainter1.java 2017-11-01 10:58:07.487940900 +0530
@@ -59,7 +59,11 @@
sync(v);
Segment text = v.getText(p0, p1);
int[] justificationData = getJustificationData(v);
- int width = Utilities.getTabbedTextWidth(v, text, metrics, (int) x, e, p0,
+
+ Component comp = v.getContainer();
+ FontMetrics metrics1 = comp.getFontMetrics(comp.getFont());
+
+ float width = Utilities.getTabbedTextWidth(v, text, metrics1, x, e, p0,
justificationData);
SegmentCache.releaseSharedSegment(text);
return width;
--- old/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicLabelUI.java 2017-11-01 10:58:13.097261800 +0530
+++ new/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicLabelUI.java 2017-11-01 10:58:12.340218500 +0530
@@ -471,8 +471,9 @@
}
public void propertyChange(PropertyChangeEvent e) {
- String name = e.getPropertyName();
- if (name == "text" || "font" == name || "foreground" == name) {
+ String name = e.getPropertyName();
+ if (name == "text" || "font" == name || "foreground" == name ||
+ "ancestor" == name || "graphicsConfig" == name) {
// remove the old html view client property if one
// existed, and install a new one if the text installed
// into the JLabel is html source.
--- old/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuItemUI.java 2017-11-01 10:58:16.837475700 +0530
+++ new/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuItemUI.java 2017-11-01 10:58:16.216440200 +0530
@@ -1106,7 +1106,8 @@
name == "accelerator") {
updateAcceleratorBinding();
} else if (name == "text" || "font" == name ||
- "foreground" == name) {
+ "foreground" == name ||
+ "ancestor" == name || "graphicsConfig" == name) {
// remove the old html view client property if one
// existed, and install a new one if the text installed
// into the JLabel is html source.
--- old/src/java.desktop/share/classes/java/awt/Component.java 2017-11-01 10:58:20.976712500 +0530
+++ new/src/java.desktop/share/classes/java/awt/Component.java 2017-11-01 10:58:20.212668800 +0530
@@ -1139,11 +1139,16 @@
if (graphicsConfig == gc) {
return false;
}
-
+ // If component is moved from one screen(hidpi) to another sceeen(lowdpi)
+ // graphicsConfig property is fired to enable the component to recalculate
+ // any rendering data, if needed
+ if (graphicsConfig != null && gc != null) {
+ firePropertyChange("graphicsConfig", graphicsConfig, gc);
+ }
graphicsConfig = gc;
ComponentPeer peer = this.peer;
- if (peer != null) {
+ if (peer != null) {
return peer.updateGraphicsData(gc);
}
return false;
--- /dev/null 2017-11-01 10:58:25.000000000 +0530
+++ new/test/jdk/javax/swing/JLabel/GetSpanHiDpiBug.java 2017-11-01 10:58:24.702925600 +0530
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2017, 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 8178025
+ * @summary Verifies if SPANs in HTML text are rendered properly in hidpi
+ * @run main/manual/othervm -Dsun.java2d.uiScale=2.25 GetSpanHiDpiBug
+ */
+import java.awt.BorderLayout;
+import java.awt.FlowLayout;
+import java.beans.PropertyChangeSupport;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextArea;
+import javax.swing.SwingUtilities;
+
+public class GetSpanHiDpiBug {
+ public static void main(String[] args) throws Exception {
+
+ final CountDownLatch latch = new CountDownLatch(1);
+ SpanTest test = new SpanTest(latch);
+ Thread T1 = new Thread(test);
+ T1.start();
+
+ // wait for latch to complete
+ boolean ret = false;
+ try {
+ ret = latch.await(3000, TimeUnit.SECONDS);
+ } catch (InterruptedException ie) {
+ throw ie;
+ }
+ if (!ret) {
+ test.dispose();
+ throw new RuntimeException(" User has not executed the test");
+ }
+ if (test.testResult == false) {
+ throw new RuntimeException("Some characters overlap");
+ }
+ }
+}
+
+class SpanTest implements Runnable {
+ static JFrame f;
+ static JDialog dialog;
+ public boolean testResult = false;
+ private final CountDownLatch latch;
+
+ public SpanTest(CountDownLatch latch) throws Exception {
+ this.latch = latch;
+ }
+
+ @Override
+ public void run() {
+ try {
+ createUI();
+ spanTest();
+ } catch (Exception ex) {
+ dispose();
+ latch.countDown();
+ throw new RuntimeException("createUI Failed: " + ex.getMessage());
+ }
+ }
+
+ public void dispose() {
+ if (dialog != null) {
+ dialog.dispose();
+ }
+ if (f != null) {
+ f.dispose();
+ }
+ }
+
+ private static void spanTest() throws Exception {
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ JLabel label =
+ new JLabel("A few words to get started "
+ + "before the bugoverlapping text");
+ f = new JFrame("");
+ f.getContentPane().add(label, BorderLayout.CENTER);
+ f.setSize(500,500);
+ f.setVisible(true);
+ }
+ });
+ }
+
+ private final void createUI() throws Exception {
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ String description
+ = " INSTRUCTIONS:\n"
+ + " A string will be shown.\n "
+ + " Press Pass if there is no overlap of characters\n"
+ + " else press Fail.";
+
+ dialog = new JDialog();
+ dialog.setTitle("textselectionTest");
+ JTextArea textArea = new JTextArea(description);
+ textArea.setEditable(false);
+ final JButton passButton = new JButton("PASS");
+ passButton.addActionListener((e) -> {
+ testResult = true;
+ dispose();
+ latch.countDown();
+ });
+ final JButton failButton = new JButton("FAIL");
+ failButton.addActionListener((e) -> {
+ testResult = false;
+ dispose();
+ latch.countDown();
+ });
+ JPanel mainPanel = new JPanel(new BorderLayout());
+ mainPanel.add(textArea, BorderLayout.CENTER);
+ JPanel buttonPanel = new JPanel(new FlowLayout());
+ buttonPanel.add(passButton);
+ buttonPanel.add(failButton);
+ mainPanel.add(buttonPanel, BorderLayout.SOUTH);
+ dialog.add(mainPanel);
+ dialog.pack();
+ dialog.setVisible(true);
+ }
+ });
+ }
+}