--- old/src/java.desktop/windows/classes/sun/awt/Win32GraphicsDevice.java 2017-02-02 17:31:18.867982900 +0300 +++ new/src/java.desktop/windows/classes/sun/awt/Win32GraphicsDevice.java 2017-02-02 17:31:18.621745700 +0300 @@ -523,9 +523,9 @@ dynamicColorModel = null; defaultConfig = null; configs = null; + initScaleFactors(); // pass on to all top-level windows on this display topLevels.notifyListeners(); - initScaleFactors(); } /** --- old/src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java 2017-02-02 17:31:20.931183500 +0300 +++ new/src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java 2017-02-02 17:31:20.648775600 +0300 @@ -80,6 +80,8 @@ * WindowStateEvent is posted to the EventQueue. */ private WindowListener windowListener; + private float scaleX; + private float scaleY; /** * Initialize JNI field IDs @@ -190,7 +192,10 @@ // Express our interest in display changes GraphicsConfiguration gc = getGraphicsConfiguration(); - ((Win32GraphicsDevice)gc.getDevice()).addDisplayChangedListener(this); + Win32GraphicsDevice gd = (Win32GraphicsDevice) gc.getDevice(); + gd.addDisplayChangedListener(this); + scaleX = gd.getDefaultScaleX(); + scaleY = gd.getDefaultScaleY(); initActiveWindowsTracking((Window)target); @@ -539,6 +544,19 @@ AWTAccessor.getComponentAccessor(). setGraphicsConfiguration((Component)target, winGraphicsConfig); + + checkDPIChange(newDev); + } + + private void checkDPIChange(Win32GraphicsDevice newDev) { + float newScaleX = newDev.getDefaultScaleX(); + float newScaleY = newDev.getDefaultScaleY(); + + if (scaleX != newScaleX || scaleY != newScaleY) { + windowDPIChange(scaleX, scaleY, newScaleX, newScaleY); + scaleX = newScaleX; + scaleY = newScaleY; + } } /** @@ -781,6 +799,9 @@ } } + native void windowDPIChange(float prevScaleX, float prevScaleY, + float newScaleX, float newScaleY); + /* * The method maps the list of the active windows to the window's AppContext, * then the method registers ActiveWindowListener, GuiDisposedListener listeners; --- old/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp 2017-02-02 17:31:22.968769400 +0300 +++ new/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp 2017-02-02 17:31:22.687515200 +0300 @@ -958,8 +958,11 @@ return 1; } +void AwtComponent::Reshape(int x, int y, int w, int h) { + ReshapeNoScale(ScaleUpX(x), ScaleUpY(y), ScaleUpX(w), ScaleUpY(h)); +} -void AwtComponent::Reshape(int x, int y, int w, int h) +void AwtComponent::ReshapeNoScale(int x, int y, int w, int h) { #if defined(DEBUG) RECT rc; @@ -968,11 +971,6 @@ DTRACE_PRINTLN4("AwtComponent::Reshape from %d, %d, %d, %d", rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top); #endif - x = ScaleUpX(x); - y = ScaleUpY(y); - w = ScaleUpX(w); - h = ScaleUpY(h); - AwtWindow* container = GetContainer(); AwtComponent* parent = GetParent(); if (container != NULL && container == parent) { --- old/src/java.desktop/windows/native/libawt/windows/awt_Component.h 2017-02-02 17:31:25.200941200 +0300 +++ new/src/java.desktop/windows/native/libawt/windows/awt_Component.h 2017-02-02 17:31:24.958274100 +0300 @@ -275,6 +275,7 @@ virtual void Show(); virtual void Hide(); virtual void Reshape(int x, int y, int w, int h); + void ReshapeNoScale(int x, int y, int w, int h); /* * Fix for 4046446. --- old/src/java.desktop/windows/native/libawt/windows/awt_Window.cpp 2017-02-02 17:31:27.090315100 +0300 +++ new/src/java.desktop/windows/native/libawt/windows/awt_Window.cpp 2017-02-02 17:31:26.818053300 +0300 @@ -153,6 +153,14 @@ jboolean isFSEMState; }; +// struct for _WindowDPIChange() method +struct ScaleStruct { + jobject window; + jfloat prevScaleX; + jfloat prevScaleY; + jfloat scaleX; + jfloat scaleY; +}; /************************************************************************ * AwtWindow fields @@ -1753,6 +1761,9 @@ (env)->SetIntField(peer, AwtWindow::sysYID, ScaleDownY(rect.top)); SendComponentEvent(java_awt_event_ComponentEvent_COMPONENT_MOVED); + prevX = rect.left; + prevY = rect.top; + env->DeleteLocalRef(target); return AwtComponent::WmMove(x, y); } @@ -2053,6 +2064,8 @@ int curScrn = GetScreenImOn(); if (curScrn != m_screenNum) { // we've been moved + int prevScrn = m_screenNum; + JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2); jclass peerCls = env->GetObjectClass(m_peerObject); @@ -2068,12 +2081,81 @@ } env->CallVoidMethod(m_peerObject, draggedID); + m_screenNum = curScrn; + WindowDPIChange(prevScrn, curScrn); env->DeleteLocalRef(peerCls); } } +int Disposition(int x1, int x2, int x) { + return x < x1 ? -1 : (x > x2 ? 1 : 0); +} + +void AwtWindow::WindowDPIChange(int prevScreen, int screen) { + Devices::InstanceAccess devices; + AwtWin32GraphicsDevice* prevDevice = devices->GetDevice(prevScreen); + AwtWin32GraphicsDevice* device = devices->GetDevice(screen); + + if (prevDevice && device) { + RECT prevBounds; + RECT bounds; + + if (MonitorBounds(prevDevice->GetMonitor(), &prevBounds) + && MonitorBounds(device->GetMonitor(), &bounds)) { + int x; + int y; + int dx; + int dy; + RECT rect; + + ::GetWindowRect(GetHWnd(), &rect); + x = rect.left; + y = rect.top; + dx = x - prevX; + dy = y - prevY; + + if (dx != 0 || dy != 0) { + int w = rect.right - rect.left; + int h = rect.bottom - rect.top; + int dispX = Disposition(prevBounds.left, prevBounds.right, + (bounds.left + bounds.right) / 2); + int dispY = Disposition(prevBounds.top, prevBounds.bottom, + (bounds.top + bounds.bottom) / 2); + + w = w * device->GetScaleX() / prevDevice->GetScaleX(); + h = h * device->GetScaleY() / prevDevice->GetScaleY(); + + prevX = x; + prevY = y; + + if (dx != 0 && dispX != 0) { + x = dispX > 0 ? bounds.left : bounds.right - w; + y = min(y, bounds.top); + ReshapeNoScale(x, y, w, h); + } else if (dy != 0 && dispY != 0) { + x = max(x, bounds.left); + y = dispY > 0 ? bounds.top : bounds.bottom - h; + ReshapeNoScale(x, y, w, h); + } + } + } + } +} + +void AwtWindow::WindowDPIChange(float prevScaleX, float prevScaleY, float scaleX, float scaleY) { + int w; + int h; + RECT rect; + + ::GetWindowRect(GetHWnd(), &rect); + + w = (rect.right - rect.left) * scaleX / prevScaleX; + h = (rect.bottom - rect.top) * scaleY / prevScaleY; + ReshapeNoScale(rect.left, rect.top, w, h); +} + BOOL AwtWindow::IsFocusableWindow() { /* * For Window/Frame/Dialog to accept focus it should: @@ -3102,6 +3184,30 @@ env->DeleteGlobalRef(self); } + +void AwtWindow::_WindowDPIChange(void* param) +{ + JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2); + + ScaleStruct *ss = (ScaleStruct *)param; + jobject self = ss->window; + jfloat prevScaleX = ss->prevScaleX; + jfloat prevScaleY = ss->prevScaleY; + jfloat scaleX = ss->scaleX; + jfloat scaleY = ss->scaleY; + + PDATA pData; + JNI_CHECK_PEER_GOTO(self, ret); + AwtWindow *window = (AwtWindow *)pData; + + window->WindowDPIChange(prevScaleX, prevScaleY, scaleX, scaleY); + +ret: + env->DeleteGlobalRef(self); + delete ss; +} + + extern "C" int getSystemMetricValue(int msgType); extern "C" { @@ -3800,4 +3906,27 @@ CATCH_BAD_ALLOC; } +/* +* Class: sun_awt_windows_WWindowPeer +* Method: windowDPIChange +* Signature: (FFFF)V +*/ +JNIEXPORT void JNICALL +Java_sun_awt_windows_WWindowPeer_windowDPIChange(JNIEnv *env, jobject self, + jfloat prevScaleX, jfloat prevScaleY, jfloat scaleX, jfloat scaleY) +{ + TRY; + + ScaleStruct *ss = new ScaleStruct; + ss->window = env->NewGlobalRef(self); + ss->prevScaleX = prevScaleX; + ss->prevScaleY = prevScaleY; + ss->scaleX = scaleX; + ss->scaleY = scaleY; + + AwtToolkit::GetInstance().SyncCall(AwtWindow::_WindowDPIChange, ss); + // global refs and mds are deleted in _SetMinSize + + CATCH_BAD_ALLOC; +} } /* extern "C" */ --- old/src/java.desktop/windows/native/libawt/windows/awt_Window.h 2017-02-02 17:31:29.318903200 +0300 +++ new/src/java.desktop/windows/native/libawt/windows/awt_Window.h 2017-02-02 17:31:29.053404300 +0300 @@ -242,6 +242,7 @@ static void _RepositionSecurityWarning(void* param); static void _SetFullScreenExclusiveModeState(void* param); static void _GetNativeWindowSize(void* param); + static void _WindowDPIChange(void* param); inline static BOOL IsResizing() { return sm_resizing; @@ -383,8 +384,12 @@ private: int m_screenNum; + int prevX; + int prevY; void InitOwner(AwtWindow *owner); + void WindowDPIChange(int prevScreen, int newScreen); + void WindowDPIChange(float prevScaleX, float prevScaleY, float scaleX, float scaleY); Type m_windowType; void InitType(JNIEnv *env, jobject peer); --- /dev/null 2017-02-02 17:31:31.000000000 +0300 +++ new/test/java/awt/Window/WindowResizingOnDPIChanging/WindowResizingOnDPIChangingTest.java 2017-02-02 17:31:31.152233600 +0300 @@ -0,0 +1,279 @@ +/* + * 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. + */ + +import java.awt.Color; +import java.awt.FlowLayout; +import java.awt.Font; +import java.awt.Frame; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.HeadlessException; +import java.awt.Image; +import java.awt.Insets; +import java.awt.Panel; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.awt.geom.AffineTransform; +import java.awt.image.AbstractMultiResolutionImage; +import java.awt.image.BufferedImage; +import java.awt.image.ImageObserver; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import javax.swing.JButton; +import javax.swing.JFrame; +import javax.swing.JPanel; +import javax.swing.JTextArea; +import javax.swing.SwingUtilities; + +/* @test + * @bug 8147440 8147016 + * @summary HiDPI (Windows): Swing components have incorrect sizes after + * changing display resolution + * @author Alexander Scherbatiy + * @run main/manual/othervm WindowResizingOnDPIChangingTest + */ +public class WindowResizingOnDPIChangingTest { + + private static volatile boolean testResult = false; + private static volatile CountDownLatch countDownLatch; + private static TestFrame undecoratedFrame; + private static TestFrame decoratedFrame; + private static JFrame mainFrame; + + private static final String INSTRUCTIONS = "INSTRUCTIONS:\n" + + "Verify that window is properly resized after the display DPI updating.\n" + + "\n" + + "The test is applicable for OSes that allows to change the display DPI\n" + + "without the system rebooting (like Windows 8.1 and higher). Press PASS for other\n" + + "systems. \n" + + "\n" + + "1. Set the display DPI size to 192 (DPI scale factor 200%)\n" + + "2. Press Show Frames button\n" + + "Two frames decorated and undecorated appear.\n" + + "3. Check that the string \"scale 2x\" is painted on the windows.\n" + + "4. Set the display DPI size to 96 (DPI scale factor 100%)\n" + + "5. Check that the string \"scale: 1x\" is painted on the windows.\n" + + "6. Check that the windows are properly resized in the same way as native applications\n" + + "7. Check that the windows are properly repainted and do not contain drawing artifacts\n" + + "If so, press PASS, else press FAIL.\n"; + + public static void main(String args[]) throws Exception { + + countDownLatch = new CountDownLatch(1); + SwingUtilities.invokeLater(WindowResizingOnDPIChangingTest::createUI); + countDownLatch.await(15, TimeUnit.MINUTES); + if (!testResult) { + throw new RuntimeException("Test fails!"); + } + } + + private static void createUI() { + + mainFrame = new JFrame("DPI change test"); + GridBagLayout layout = new GridBagLayout(); + JPanel mainControlPanel = new JPanel(layout); + JPanel resultButtonPanel = new JPanel(layout); + + GridBagConstraints gbc = new GridBagConstraints(); + + JPanel testPanel = new JPanel(new FlowLayout()); + JButton frameButton = new JButton("Show Frames"); + frameButton.addActionListener((e) -> { + int x = 20; + int y = 10; + int w = 400; + int h = 300; + + undecoratedFrame = new TestFrame(w, h, true); + undecoratedFrame.setLocation(x, y); + undecoratedFrame.setVisible(true); + + decoratedFrame = new TestFrame(w, h, false); + decoratedFrame.setLocation(x + w + 10, y); + decoratedFrame.setVisible(true); + + }); + testPanel.add(frameButton); + + gbc.gridx = 0; + gbc.gridy = 0; + gbc.fill = GridBagConstraints.HORIZONTAL; + mainControlPanel.add(testPanel, gbc); + + JTextArea instructionTextArea = new JTextArea(); + instructionTextArea.setText(INSTRUCTIONS); + instructionTextArea.setEditable(false); + instructionTextArea.setBackground(Color.white); + + gbc.gridx = 0; + gbc.gridy = 1; + gbc.fill = GridBagConstraints.HORIZONTAL; + mainControlPanel.add(instructionTextArea, gbc); + + JButton passButton = new JButton("Pass"); + passButton.setActionCommand("Pass"); + passButton.addActionListener((ActionEvent e) -> { + testResult = true; + disposeFrames(); + countDownLatch.countDown(); + + }); + + JButton failButton = new JButton("Fail"); + failButton.setActionCommand("Fail"); + failButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + disposeFrames(); + countDownLatch.countDown(); + } + }); + + gbc.gridx = 0; + gbc.gridy = 0; + resultButtonPanel.add(passButton, gbc); + + gbc.gridx = 1; + gbc.gridy = 0; + resultButtonPanel.add(failButton, gbc); + + gbc.gridx = 0; + gbc.gridy = 2; + mainControlPanel.add(resultButtonPanel, gbc); + + mainFrame.add(mainControlPanel); + mainFrame.pack(); + + mainFrame.addWindowListener(new WindowAdapter() { + + @Override + public void windowClosing(WindowEvent e) { + disposeFrames(); + countDownLatch.countDown(); + } + }); + mainFrame.setVisible(true); + } + + private static void disposeFrames() { + if (decoratedFrame != null && decoratedFrame.isVisible()) { + decoratedFrame.dispose(); + } + if (undecoratedFrame != null && undecoratedFrame.isVisible()) { + undecoratedFrame.dispose(); + } + if (mainFrame != null && mainFrame.isVisible()) { + mainFrame.dispose(); + } + } + + static class TestFrame extends Frame { + + private final TestMultiResolutionImage mrImage; + + public TestFrame(int width, int height, boolean undecorated) throws HeadlessException { + super("Test Frame. Undecorated: " + undecorated); + setSize(width, height); + mrImage = new TestMultiResolutionImage(width, height); + + setUndecorated(undecorated); + Panel panel = new Panel(new FlowLayout()) { + @Override + public void paint(Graphics g) { + super.paint(g); + AffineTransform tx = ((Graphics2D) g).getTransform(); + mrImage.scaleX = tx.getScaleX(); + mrImage.scaleY = tx.getScaleY(); + Insets insets = getInsets(); + g.drawImage(mrImage, insets.left, insets.bottom, null); + } + }; + add(panel); + } + } + + static class TestMultiResolutionImage extends AbstractMultiResolutionImage { + + final int width; + final int height; + double scaleX; + double scaleY; + + public TestMultiResolutionImage(int width, int height) { + this.width = width; + this.height = height; + } + + @Override + public int getWidth(ImageObserver observer) { + return width; + } + + @Override + public int getHeight(ImageObserver observer) { + return height; + } + + @Override + protected Image getBaseImage() { + return getResolutionVariant(width, height); + } + + @Override + public Image getResolutionVariant(double destImageWidth, double destImageHeight) { + + int w = (int) destImageWidth; + int h = (int) destImageHeight; + + BufferedImage img = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB); + Graphics2D g = img.createGraphics(); + g.scale(scaleX, scaleY); + int red = (int) (255 / scaleX); + int green = (int) (250 / scaleX); + int blue = (int) (20 / scaleX); + g.setColor(new Color(red, green, blue)); + g.fillRect(0, 0, width, height); + + g.setColor(Color.decode("#87CEFA")); + Font f = g.getFont(); + g.setFont(new Font(f.getName(), Font.BOLD, 24)); + g.drawString(String.format("scales: [%1.2fx, %1.2fx]", scaleX, scaleY), + width / 6, height / 2); + + g.dispose(); + return img; + } + + @Override + public List getResolutionVariants() { + return Collections.unmodifiableList(Arrays.asList(getBaseImage())); + } + } +} --- /dev/null 2017-02-02 17:31:32.000000000 +0300 +++ new/test/java/awt/Window/WindowResizingOnDPIChanging/WindowResizingOnMovingToAnotherDisplay.java 2017-02-02 17:31:32.471714400 +0300 @@ -0,0 +1,275 @@ +/* + * 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. + */ + +import java.awt.Color; +import java.awt.FlowLayout; +import java.awt.Font; +import java.awt.Frame; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.HeadlessException; +import java.awt.Image; +import java.awt.Insets; +import java.awt.Panel; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.awt.geom.AffineTransform; +import java.awt.image.AbstractMultiResolutionImage; +import java.awt.image.BufferedImage; +import java.awt.image.ImageObserver; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import javax.swing.JButton; +import javax.swing.JFrame; +import javax.swing.JPanel; +import javax.swing.JTextArea; +import javax.swing.SwingUtilities; + +/* @test + * @bug 8147440 8147016 + * @summary HiDPI (Windows): Swing components have incorrect sizes after + * changing display resolution + * @author Alexander Scherbatiy + * @run main/manual/othervm WindowResizingOnMovingToAnotherDisplay + */ +public class WindowResizingOnMovingToAnotherDisplay { + + private static volatile boolean testResult = false; + private static volatile CountDownLatch countDownLatch; + private static TestFrame frame; + private static JFrame mainFrame; + + private static final String INSTRUCTIONS = "INSTRUCTIONS:\n" + + "Verify that a window is properly resized after moving to a display" + + " with different DPI.\n" + + "\n" + + "The test is applicable for a multi-monitor system where displays" + + " are configured to have different DPI\n" + + "\n" + + "1. Press Show Frame button\n" + + "The frame appear.\n" + + "2. Check that the string \"scales [ScaleX, ScaleY]\" is painted on the window" + + " where ScaleX and ScaleY are the scales for current display.\n" + + "The scales are calculated as DPI / 96 and are 1 for the DPI value 96" + + " and 2 for the DPI value 192.\n" + + "3. Move the frame to the second display.\n" + + "4. Check that the string \"scales [ScaleX, ScaleY]\" is updated" + + " to show the right display scales.\n" + + "5. Check that the window is properly resized.\n" + + "6. Check that the window is properly repainted and does not contain drawing artifacts\n" + + "Try different display positions (left, right, top, bottom).\n" + + "If all tests are passed, press PASS, else press FAIL.\n"; + + public static void main(String args[]) throws Exception { + + countDownLatch = new CountDownLatch(1); + SwingUtilities.invokeLater(WindowResizingOnMovingToAnotherDisplay::createUI); + countDownLatch.await(15, TimeUnit.MINUTES); + if (!testResult) { + throw new RuntimeException("Test fails!"); + } + } + + private static void createUI() { + + mainFrame = new JFrame("DPI change test"); + GridBagLayout layout = new GridBagLayout(); + JPanel mainControlPanel = new JPanel(layout); + JPanel resultButtonPanel = new JPanel(layout); + + GridBagConstraints gbc = new GridBagConstraints(); + + JPanel testPanel = new JPanel(new FlowLayout()); + JButton frameButton = new JButton("Show Frame"); + frameButton.addActionListener((e) -> { + int x = 20; + int y = 10; + int w = 400; + int h = 300; + + frame = new TestFrame(w, h); + frame.setLocation(x, y); + frame.setVisible(true); + + }); + testPanel.add(frameButton); + + gbc.gridx = 0; + gbc.gridy = 0; + gbc.fill = GridBagConstraints.HORIZONTAL; + mainControlPanel.add(testPanel, gbc); + + JTextArea instructionTextArea = new JTextArea(); + instructionTextArea.setText(INSTRUCTIONS); + instructionTextArea.setEditable(false); + instructionTextArea.setBackground(Color.white); + + gbc.gridx = 0; + gbc.gridy = 1; + gbc.fill = GridBagConstraints.HORIZONTAL; + mainControlPanel.add(instructionTextArea, gbc); + + JButton passButton = new JButton("Pass"); + passButton.setActionCommand("Pass"); + passButton.addActionListener((ActionEvent e) -> { + testResult = true; + disposeFrames(); + countDownLatch.countDown(); + + }); + + JButton failButton = new JButton("Fail"); + failButton.setActionCommand("Fail"); + failButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + disposeFrames(); + countDownLatch.countDown(); + } + }); + + gbc.gridx = 0; + gbc.gridy = 0; + resultButtonPanel.add(passButton, gbc); + + gbc.gridx = 1; + gbc.gridy = 0; + resultButtonPanel.add(failButton, gbc); + + gbc.gridx = 0; + gbc.gridy = 2; + mainControlPanel.add(resultButtonPanel, gbc); + + mainFrame.add(mainControlPanel); + mainFrame.pack(); + + mainFrame.addWindowListener(new WindowAdapter() { + + @Override + public void windowClosing(WindowEvent e) { + disposeFrames(); + countDownLatch.countDown(); + } + }); + mainFrame.setVisible(true); + } + + private static void disposeFrames() { + if (frame != null && frame.isVisible()) { + frame.dispose(); + } + + if (mainFrame != null && mainFrame.isVisible()) { + mainFrame.dispose(); + } + } + + static class TestFrame extends Frame { + + private final TestMultiResolutionImage mrImage; + + public TestFrame(int width, int height) throws HeadlessException { + super("Test Frame"); + setSize(width, height); + mrImage = new TestMultiResolutionImage(width, height); + + Panel panel = new Panel(new FlowLayout()) { + @Override + public void paint(Graphics g) { + super.paint(g); + AffineTransform tx = ((Graphics2D) g).getTransform(); + mrImage.scaleX = tx.getScaleX(); + mrImage.scaleY = tx.getScaleY(); + Insets insets = getInsets(); + g.drawImage(mrImage, insets.left, insets.bottom, null); + } + }; + add(panel); + } + } + + static class TestMultiResolutionImage extends AbstractMultiResolutionImage { + + final int width; + final int height; + double scaleX; + double scaleY; + + public TestMultiResolutionImage(int width, int height) { + this.width = width; + this.height = height; + } + + @Override + public int getWidth(ImageObserver observer) { + return width; + } + + @Override + public int getHeight(ImageObserver observer) { + return height; + } + + @Override + protected Image getBaseImage() { + return getResolutionVariant(width, height); + } + + @Override + public Image getResolutionVariant(double destImageWidth, double destImageHeight) { + + int w = (int) destImageWidth; + int h = (int) destImageHeight; + + BufferedImage img = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB); + Graphics2D g = img.createGraphics(); + g.scale(scaleX, scaleY); + int red = (int) (255 / scaleX); + int green = (int) (250 / scaleX); + int blue = (int) (20 / scaleX); + g.setColor(new Color(red, green, blue)); + g.fillRect(0, 0, width, height); + + g.setColor(Color.decode("#87CEFA")); + Font f = g.getFont(); + g.setFont(new Font(f.getName(), Font.BOLD, 24)); + g.drawString(String.format("scales: [%1.2fx, %1.2fx]", scaleX, scaleY), + width / 6, height / 2); + + g.dispose(); + return img; + } + + @Override + public List getResolutionVariants() { + return Collections.unmodifiableList(Arrays.asList(getBaseImage())); + } + } +}