Skip to content
Permalink
Browse files
8258788: incorrect response to change in window insets [lanai]
Reviewed-by: serb, jdv
  • Loading branch information
Alexey Ushakov authored and Phil Race committed Apr 12, 2021
1 parent f479437 commit 714ae54f91d17d9bbd829f4b1b3922ccdb9121b5
@@ -726,7 +726,7 @@ public void notifyReshape(int x, int y, int w, int h) {
setPlatformMaximizedBounds(getDefaultMaximizedBounds());
}

if (pResized || isNewDevice) {
if (pResized || isNewDevice || invalid) {
replaceSurfaceData();
updateMinimumSize();
}
@@ -0,0 +1,164 @@
/*
* Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2021, JetBrains s.r.o.. 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
* @key headful
* @bug 8258788
* @summary [macosx] full window content option rendering test
* @author Alexey Ushakov
* @run main FullWindowContentRenderTest
* @requires (os.family == "mac")
*/

import java.awt.*;
import java.awt.image.BufferedImage;
import java.lang.reflect.InvocationTargetException;
import javax.swing.*;

public class FullWindowContentRenderTest
{
private static final int TD = 10;
static FullWindowContentRenderTest theTest;
private Robot robot;
private JFrame frame;
private JRootPane rootPane;

private int DELAY = 1000;

public FullWindowContentRenderTest() {
try {
robot = new Robot();
} catch (AWTException ex) {
throw new RuntimeException(ex);
}
}

public void performTest() {

runSwing(() -> {
frame = new JFrame("Test");
frame.setBounds(100, 100, 100, 150);
rootPane = frame.getRootPane();
JComponent contentPane = (JComponent) frame.getContentPane();
JPanel comp = new JPanel() {
@Override
protected void paintComponent(Graphics g) {
super.paintComponent(g);
g.setColor(Color.BLUE);
g.fillRect(35, 30, 30, 30);
g.setColor(Color.GREEN);
g.fillRect(35, 60, 30, 30);
}
};
contentPane.add(comp);
comp.setBackground(Color.RED);
frame.setVisible(true);
});

robot.delay(DELAY);
final int topInset = frame.getInsets().top;
final int px = 50, py = topInset + 40;

Color c = getTestPixel(px, py);
if (!validateColor(c, Color.BLUE)) {
throw new RuntimeException("Test failed. Incorrect color " + c +
"at (" + px + "," + py + ")");
}

runSwing(() -> rootPane.putClientProperty("apple.awt.fullWindowContent", true));

robot.delay(DELAY);

c = getTestPixel(50, topInset + 40);
if (!validateColor(c, Color.GREEN)) {
throw new RuntimeException("Test failed. Incorrect color " + c +
" at (" + px + "," + py + ")");
}

runSwing(() -> rootPane.putClientProperty("apple.awt.fullWindowContent", false));

robot.delay(DELAY);

c = getTestPixel(50, topInset + 40);
if (!validateColor(c, Color.BLUE)) {
throw new RuntimeException("Test failed. Incorrect color " + c +
"at (" + px + "," + py + ")");
}

runSwing(() -> frame.dispose());

frame = null;
rootPane = null;
}

private Color getTestPixel(int x, int y) {
Rectangle bounds = frame.getBounds();
BufferedImage screenImage = robot.createScreenCapture(bounds);
int rgb = screenImage.getRGB(x, y);
int red = (rgb >> 16) & 0xFF;
int green = (rgb >> 8) & 0xFF;
int blue = rgb & 0xFF;
Color c = new Color(red, green, blue);
return c;
}

private boolean validateColor(Color c, Color expected) {
return Math.abs(c.getRed() - expected.getRed()) <= TD &&
Math.abs(c.getGreen() - expected.getGreen()) <= TD &&
Math.abs(c.getBlue() - expected.getBlue()) <= TD;
}

public void dispose() {
if (frame != null) {
frame.dispose();
frame = null;
}
}

private static void runSwing(Runnable r) {
try {
SwingUtilities.invokeAndWait(r);
} catch (InterruptedException e) {
} catch (InvocationTargetException e) {
throw new RuntimeException(e);
}
}

public static void main(String[] args) {
if (!System.getProperty("os.name").contains("OS X")) {
System.out.println("This test is for MacOS only. Automatically passed on other platforms.");
return;
}

try {
runSwing(() -> theTest = new FullWindowContentRenderTest());
theTest.performTest();
} finally {
if (theTest != null) {
runSwing(() -> theTest.dispose());
}
}
}
}

1 comment on commit 714ae54

@openjdk-notifier

This comment has been minimized.

Copy link

@openjdk-notifier openjdk-notifier bot commented on 714ae54 Apr 12, 2021

Please sign in to comment.