infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-06 03:35:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

8191428: Regression: Swing button label wrapping with hidpi

Browse Source 
Reviewed-by: serb, ssadetsky
This commit is contained in:
Prasanta Sadhukhan 2017-11-22 15:48:15 +05:30
parent 8a81d5f700
commit e27e8b9e39
2 changed files with 73 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java.desktop/share/classes/javax/swing/text/GlyphPainter1.java
View File

@ -60,7 +60,7 @@ class GlyphPainter1 extends GlyphView.GlyphPainter {
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;

72
test/jdk/javax/swing/JButton/TestGlyphBreak.java Normal file
View File

@ -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");
}
}
}