changeset 48166:a9854da9252d

8191428: Regression: Swing button label wrapping with hidpi Reviewed-by: serb, ssadetsky
author psadhukhan
date Wed, 22 Nov 2017 15:48:15 +0530
parents a42e805414e4
children 1c8b81ff863e
files src/java.desktop/share/classes/javax/swing/text/GlyphPainter1.java test/jdk/javax/swing/JButton/TestGlyphBreak.java
diffstat 2 files changed, 73 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.desktop/share/classes/javax/swing/text/GlyphPainter1.java	Wed Nov 22 12:05:06 2017 +0530
+++ b/src/java.desktop/share/classes/javax/swing/text/GlyphPainter1.java	Wed Nov 22 15:48:15 2017 +0530
@@ -60,7 +60,7 @@
         Segment text = v.getText(p0, p1);
         int[] justificationData = getJustificationData(v);
 
-        float width = Utilities.getTabbedTextWidth(v, text, metrics, x, e, p0,
+        int width = Utilities.getTabbedTextWidth(v, text, metrics, (int)x, e, p0,
                                                  justificationData);
         SegmentCache.releaseSharedSegment(text);
         return width;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/javax/swing/JButton/TestGlyphBreak.java	Wed Nov 22 15:48:15 2017 +0530
@@ -0,0 +1,72 @@
+/*
+ * 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 8191428
+ * @summary  Verifies if text view is not borken into multiple lines
+ * @run main/othervm -Dsun.java2d.uiScale=1.2 TestGlyphBreak
+ */
+
+import java.awt.FontMetrics;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.SwingUtilities;
+
+public class TestGlyphBreak {
+
+    static JFrame f;
+    static int btnHeight;
+    static FontMetrics fm;
+
+    public static void main(String[] args) throws Exception {
+
+        SwingUtilities.invokeAndWait(() -> {
+
+            String str = "<html><font size=2 color=red><bold>Three!</font></html>";
+            JButton b = new JButton();
+            b.setText(str);
+
+            f = new JFrame();
+            f.add(b);
+            f.pack();
+            f.setVisible(true);
+            btnHeight = b.getHeight();
+            fm = b.getFontMetrics(b.getFont());
+
+        });
+
+        try {
+            Thread.sleep(2000);
+        } catch (InterruptedException ex) {
+        }
+        SwingUtilities.invokeAndWait(() -> f.dispose());
+        System.out.println("metrics getHeight " + fm.getHeight() +
+                             " button height " + btnHeight);
+
+        // Check if text is broken into 2 lines, in which case button height
+        // will be twice the string height
+        if (btnHeight > 2*fm.getHeight()) {
+            throw new RuntimeException("TextView is broken into different lines");
+        }
+    }
+}