From 4b246c345fa2edcf91c8025e4b7831c5d521e571 Mon Sep 17 00:00:00 2001 From: pchelko Date: Fri, 11 Oct 2013 11:48:52 +0400 Subject: [PATCH] 8026143: [macosx] Maximized state could be inconsistent between peer and frame Reviewed-by: anthony, serb --- .../sun/lwawt/macosx/CPlatformWindow.java | 40 +++++-- src/macosx/native/sun/awt/AWTWindow.m | 14 --- .../MaximizedByPlatform.java | 105 ++++++++++++++++++ 3 files changed, 135 insertions(+), 24 deletions(-) create mode 100644 test/java/awt/Frame/MaximizedByPlatform/MaximizedByPlatform.java diff --git a/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java b/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java index 97ff63228..0ef9c302f 100644 --- a/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java +++ b/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java @@ -538,6 +538,8 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo updateIconImages(); updateFocusabilityForAutoRequestFocus(false); + boolean wasMaximized = isMaximized(); + // Actually show or hide the window LWWindowPeer blocker = (peer == null)? null : peer.getBlocker(); if (blocker == null || !visible) { @@ -571,16 +573,21 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo if (visible) { // Apply the extended state as expected in shared code if (target instanceof Frame) { - switch (((Frame)target).getExtendedState()) { - case Frame.ICONIFIED: - CWrapper.NSWindow.miniaturize(nsWindowPtr); - break; - case Frame.MAXIMIZED_BOTH: - maximize(); - break; - default: // NORMAL - unmaximize(); // in case it was maximized, otherwise this is a no-op - break; + if (!wasMaximized && isMaximized()) { + // setVisible could have changed the native maximized state + deliverZoom(true); + } else { + switch (((Frame)target).getExtendedState()) { + case Frame.ICONIFIED: + CWrapper.NSWindow.miniaturize(nsWindowPtr); + break; + case Frame.MAXIMIZED_BOTH: + maximize(); + break; + default: // NORMAL + unmaximize(); // in case it was maximized, otherwise this is a no-op + break; + } } } } @@ -927,6 +934,8 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo return; } + checkZoom(); + final Rectangle oldB = nativeBounds; nativeBounds = new Rectangle(x, y, width, height); if (peer != null) { @@ -957,6 +966,17 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo } } + private void checkZoom() { + if (target instanceof Frame && isVisible()) { + Frame targetFrame = (Frame)target; + if (targetFrame.getExtendedState() != Frame.MAXIMIZED_BOTH && isMaximized()) { + deliverZoom(true); + } else if (targetFrame.getExtendedState() == Frame.MAXIMIZED_BOTH && !isMaximized()) { + deliverZoom(false); + } + } + } + private void deliverNCMouseDown() { if (peer != null) { peer.notifyNCMouseDown(); diff --git a/src/macosx/native/sun/awt/AWTWindow.m b/src/macosx/native/sun/awt/AWTWindow.m index 2231f10d1..59acc9fd8 100644 --- a/src/macosx/native/sun/awt/AWTWindow.m +++ b/src/macosx/native/sun/awt/AWTWindow.m @@ -501,20 +501,6 @@ AWT_ASSERT_APPKIT_THREAD; // window exposing in _setVisible:(BOOL) } -- (BOOL)windowShouldZoom:(NSWindow *)window toFrame:(NSRect)proposedFrame { -AWT_ASSERT_APPKIT_THREAD; - - [AWTToolkit eventCountPlusPlus]; - JNIEnv *env = [ThreadUtilities getJNIEnv]; - jobject platformWindow = [self.javaPlatformWindow jObjectWithEnv:env]; - if (platformWindow != NULL) { - static JNF_MEMBER_CACHE(jm_deliverZoom, jc_CPlatformWindow, "deliverZoom", "(Z)V"); - JNFCallVoidMethod(env, platformWindow, jm_deliverZoom, ![window isZoomed]); - (*env)->DeleteLocalRef(env, platformWindow); - } - return YES; -} - - (void) _deliverIconify:(BOOL)iconify { AWT_ASSERT_APPKIT_THREAD; diff --git a/test/java/awt/Frame/MaximizedByPlatform/MaximizedByPlatform.java b/test/java/awt/Frame/MaximizedByPlatform/MaximizedByPlatform.java new file mode 100644 index 000000000..070aa4deb --- /dev/null +++ b/test/java/awt/Frame/MaximizedByPlatform/MaximizedByPlatform.java @@ -0,0 +1,105 @@ +/* + * Copyright (c) 2013, 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 8026143 + * @summary [macosx] Maximized state could be inconsistent between peer and frame + * @author Petr Pchelko + * @run main MaximizedByPlatform + */ + +import sun.awt.OSInfo; +import sun.awt.SunToolkit; + +import java.awt.*; + +public class MaximizedByPlatform { + private static Frame frame; + private static Rectangle availableScreenBounds; + + public static void main(String[] args) { + if (OSInfo.getOSType() != OSInfo.OSType.MACOSX) { + // Test only for macosx. Pass + return; + } + + availableScreenBounds = getAvailableScreenBounds(); + + // Test 1. The maximized state is set in setBounds + try { + frame = new Frame(); + frame.setBounds(100, 100, 100, 100); + frame.setVisible(true); + + ((SunToolkit)Toolkit.getDefaultToolkit()).realSync(); + + frame.setBounds(availableScreenBounds.x, availableScreenBounds.y, + availableScreenBounds.width, availableScreenBounds.height); + + ((SunToolkit)Toolkit.getDefaultToolkit()).realSync(); + + if (frame.getExtendedState() != Frame.MAXIMIZED_BOTH) { + throw new RuntimeException("Maximized state was not set for frame in setBounds"); + } + } finally { + frame.dispose(); + } + + + // Test 2. The maximized state is set in setVisible + try { + frame = new Frame(); + frame.setBounds(availableScreenBounds.x, availableScreenBounds.y, + availableScreenBounds.width + 100, availableScreenBounds.height); + frame.setVisible(true); + + ((SunToolkit)Toolkit.getDefaultToolkit()).realSync(); + + if (frame.getExtendedState() != Frame.MAXIMIZED_BOTH) { + throw new RuntimeException("Maximized state was not set for frame in setVisible"); + } + } finally { + frame.dispose(); + } + } + + private static Rectangle getAvailableScreenBounds() { + final Toolkit toolkit = Toolkit.getDefaultToolkit(); + final GraphicsEnvironment graphicsEnvironment = + GraphicsEnvironment.getLocalGraphicsEnvironment(); + final GraphicsDevice graphicsDevice = + graphicsEnvironment.getDefaultScreenDevice(); + + final Dimension screenSize = toolkit.getScreenSize(); + final Insets screenInsets = toolkit.getScreenInsets( + graphicsDevice.getDefaultConfiguration()); + + final Rectangle availableScreenBounds = new Rectangle(screenSize); + + availableScreenBounds.x += screenInsets.left; + availableScreenBounds.y += screenInsets.top; + availableScreenBounds.width -= (screenInsets.left + screenInsets.right); + availableScreenBounds.height -= (screenInsets.top + screenInsets.bottom); + return availableScreenBounds; + } +} -- GitLab