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

8144594: HiDPI: awt.Choice looks improperly (Win 8)

Browse Source 
Reviewed-by: alexsch, serb
This commit is contained in:
Rajeev Chamyal 2016-08-02 10:46:08 +05:30 committed by Rajeev Chamyal
parent 8ab66b8911
commit c7f532a83d
2 changed files with 63 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jdk/src/java.desktop/windows/native/libawt/windows/awt_Choice.cpp
View File

@ -345,7 +345,7 @@ jobject AwtChoice::PreferredItemSize(JNIEnv *env)
* drop down item height.
*/
env->SetIntField(dimension, AwtDimension::heightID,
GetFontHeight(env));
ScaleUpY(GetFontHeight(env)));
return dimension;
}

62
jdk/test/java/awt/Choice/ChoiceHiDpi/ChoiceTest.java Normal file
View File

@ -0,0 +1,62 @@
/*
* Copyright (c) 2016, 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 8144594
* @summary HiDPI: awt.Choice looks improperly (Win 8)
* @run main ChoiceTest
*/
import java.awt.Frame;
import java.awt.Choice;
import java.awt.Font;
import java.util.stream.Stream;
public class ChoiceTest {
private static void UI() {
Frame frame = new Frame("Test frame");
Choice choice = new Choice();
Stream.of(new String[]{"item 1", "item 2", "item 3"}).forEach(choice::add);
frame.add(choice);
frame.setBounds(100, 100, 400, 200);
frame.setVisible(true);
Font font = choice.getFont();
int size = font.getSize();
int height = choice.getBounds().height;
try {
if (height < size) {
throw new RuntimeException("Test failed");
}
} finally {
frame.dispose();
}
}
public static void main(String[] args) throws Exception {
ChoiceTest.UI();
}
}