--- old/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java 2013-09-12 17:14:13.000000000 +0400 +++ new/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java 2013-09-12 17:14:13.000000000 +0400 @@ -210,7 +210,6 @@ private boolean undecorated; // initialized in getInitialStyleBits() private Rectangle normalBounds = null; // not-null only for undecorated maximized windows private CPlatformResponder responder; - private volatile boolean zoomed = false; // from native perspective public CPlatformWindow() { super(0, true); @@ -231,7 +230,9 @@ contentView.initialize(peer, responder); final long ownerPtr = owner != null ? owner.getNSWindowPtr() : 0L; - final long nativeWindowPtr = nativeCreateNSWindow(contentView.getAWTView(), ownerPtr, styleBits, 0, 0, 0, 0); + Rectangle bounds = _target.getBounds(); + final long nativeWindowPtr = nativeCreateNSWindow(contentView.getAWTView(), + ownerPtr, styleBits, bounds.x, bounds.y, bounds.width, bounds.height); setPtr(nativeWindowPtr); if (target instanceof javax.swing.RootPaneContainer) { @@ -466,7 +467,8 @@ } private boolean isMaximized() { - return undecorated ? this.normalBounds != null : zoomed; + return undecorated ? this.normalBounds != null + : CWrapper.NSWindow.isZoomed(getNSWindowPtr()); } private void maximize() { @@ -474,7 +476,6 @@ return; } if (!undecorated) { - zoomed = true; CWrapper.NSWindow.zoom(getNSWindowPtr()); } else { deliverZoom(true); @@ -496,7 +497,6 @@ return; } if (!undecorated) { - zoomed = false; CWrapper.NSWindow.zoom(getNSWindowPtr()); } else { deliverZoom(false); --- old/src/macosx/classes/sun/lwawt/macosx/CWrapper.java 2013-09-12 17:14:14.000000000 +0400 +++ new/src/macosx/classes/sun/lwawt/macosx/CWrapper.java 2013-09-12 17:14:14.000000000 +0400 @@ -68,6 +68,7 @@ public static native void miniaturize(long window); public static native void deminiaturize(long window); + public static native boolean isZoomed(long window); public static native void zoom(long window); public static native void makeFirstResponder(long window, long responder); --- old/src/macosx/native/sun/awt/CWrapper.m 2013-09-12 17:14:15.000000000 +0400 +++ new/src/macosx/native/sun/awt/CWrapper.m 2013-09-12 17:14:15.000000000 +0400 @@ -437,6 +437,29 @@ /* * Class: sun_lwawt_macosx_CWrapper$NSWindow + * Method: isZoomed + * Signature: (J)Z + */ +JNIEXPORT jboolean JNICALL +Java_sun_lwawt_macosx_CWrapper_00024NSWindow_isZoomed +(JNIEnv *env, jclass cls, jlong windowPtr) +{ + __block jboolean isZoomed = JNI_FALSE; + +JNF_COCOA_ENTER(env); + + NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr); + [ThreadUtilities performOnMainThreadWaiting:YES block:^(){ + isZoomed = [window isZoomed]; + }]; + +JNF_COCOA_EXIT(env); + + return isZoomed; +} + +/* + * Class: sun_lwawt_macosx_CWrapper$NSWindow * Method: zoom * Signature: (J)V */ --- /dev/null 2013-09-12 17:14:16.000000000 +0400 +++ new/test/java/awt/Frame/MaximizedToMaximized/MaximizedToMaximized.java 2013-09-12 17:14:16.000000000 +0400 @@ -0,0 +1,76 @@ +/* + * 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. + */ + +import java.awt.Dimension; +import java.awt.Frame; +import java.awt.GraphicsDevice; +import java.awt.GraphicsEnvironment; +import java.awt.Insets; +import java.awt.Rectangle; +import java.awt.Toolkit; +import sun.awt.SunToolkit; + +/** + * @test + * @bug 8007219 + * @author Alexander Scherbatiy + * @summary Frame size reverts meaning of maximized attribute + * @run main MaximizedToMaximized + */ +public class MaximizedToMaximized { + + public static void main(String[] args) throws Exception { + + Frame frame = new Frame(); + 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); + + frame.setBounds(availableScreenBounds.x, availableScreenBounds.y, + availableScreenBounds.width, availableScreenBounds.height); + frame.setVisible(true); + + Rectangle frameBounds = frame.getBounds(); + frame.setExtendedState(Frame.MAXIMIZED_BOTH); + ((SunToolkit) toolkit).realSync(); + + Rectangle maximizedFrameBounds = frame.getBounds(); + if (maximizedFrameBounds.width < frameBounds.width + || maximizedFrameBounds.height < frameBounds.height) { + throw new RuntimeException("Maximized frame is smaller than non maximized"); + } + } +}