8139208: [macosx] Issue with setExtendedState of JFrame
Reviewed-by: honkar, dnguyen, azvegint
This commit is contained in:
parent
99ea8bf2b9
commit
21916f32c0
src/java.desktop/macosx/classes/sun/lwawt/macosx
test/jdk/javax/swing/JFrame
@ -667,6 +667,44 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
|
||||
execute(CPlatformWindow::nativeSetNSWindowLocationByPlatform);
|
||||
}
|
||||
|
||||
// Manage the extended state when showing
|
||||
if (visible) {
|
||||
/* Frame or Dialog should be set property WINDOW_FULLSCREENABLE to true if the
|
||||
Frame or Dialog is resizable.
|
||||
*/
|
||||
final boolean resizable = (target instanceof Frame) ? ((Frame)target).isResizable() :
|
||||
((target instanceof Dialog) ? ((Dialog)target).isResizable() : false);
|
||||
if (resizable) {
|
||||
setCanFullscreen(true);
|
||||
}
|
||||
|
||||
// Apply the extended state as expected in shared code
|
||||
if (target instanceof Frame) {
|
||||
if (!wasMaximized && isMaximized()) {
|
||||
// setVisible could have changed the native maximized state
|
||||
deliverZoom(true);
|
||||
} else {
|
||||
int frameState = ((Frame)target).getExtendedState();
|
||||
if ((frameState & Frame.ICONIFIED) != 0) {
|
||||
// Treat all state bit masks with ICONIFIED bit as ICONIFIED state.
|
||||
frameState = Frame.ICONIFIED;
|
||||
}
|
||||
|
||||
switch (frameState) {
|
||||
case Frame.ICONIFIED:
|
||||
execute(CWrapper.NSWindow::miniaturize);
|
||||
break;
|
||||
case Frame.MAXIMIZED_BOTH:
|
||||
maximize();
|
||||
break;
|
||||
default: // NORMAL
|
||||
unmaximize(); // in case it was maximized, otherwise this is a no-op
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Actually show or hide the window
|
||||
LWWindowPeer blocker = (peer == null)? null : peer.getBlocker();
|
||||
if (blocker == null || !visible) {
|
||||
@ -727,44 +765,6 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
|
||||
}
|
||||
this.visible = visible;
|
||||
|
||||
// Manage the extended state when showing
|
||||
if (visible) {
|
||||
/* Frame or Dialog should be set property WINDOW_FULLSCREENABLE to true if the
|
||||
Frame or Dialog is resizable.
|
||||
**/
|
||||
final boolean resizable = (target instanceof Frame) ? ((Frame)target).isResizable() :
|
||||
((target instanceof Dialog) ? ((Dialog)target).isResizable() : false);
|
||||
if (resizable) {
|
||||
setCanFullscreen(true);
|
||||
}
|
||||
|
||||
// Apply the extended state as expected in shared code
|
||||
if (target instanceof Frame) {
|
||||
if (!wasMaximized && isMaximized()) {
|
||||
// setVisible could have changed the native maximized state
|
||||
deliverZoom(true);
|
||||
} else {
|
||||
int frameState = ((Frame)target).getExtendedState();
|
||||
if ((frameState & Frame.ICONIFIED) != 0) {
|
||||
// Treat all state bit masks with ICONIFIED bit as ICONIFIED state.
|
||||
frameState = Frame.ICONIFIED;
|
||||
}
|
||||
|
||||
switch (frameState) {
|
||||
case Frame.ICONIFIED:
|
||||
execute(CWrapper.NSWindow::miniaturize);
|
||||
break;
|
||||
case Frame.MAXIMIZED_BOTH:
|
||||
maximize();
|
||||
break;
|
||||
default: // NORMAL
|
||||
unmaximize(); // in case it was maximized, otherwise this is a no-op
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
nativeSynthesizeMouseEnteredExitedEvents();
|
||||
|
||||
// Configure stuff #2
|
||||
@ -1023,7 +1023,6 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
|
||||
// let's return into the normal states first
|
||||
execute(CWrapper.NSWindow::deminiaturize);
|
||||
waitForWindowState(Frame.NORMAL);
|
||||
|
||||
}
|
||||
maximize();
|
||||
break;
|
||||
|
80
test/jdk/javax/swing/JFrame/MaximizeWindowTest.java
Normal file
80
test/jdk/javax/swing/JFrame/MaximizeWindowTest.java
Normal file
@ -0,0 +1,80 @@
|
||||
/*
|
||||
* Copyright (c) 2023, 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 javax.swing.JFrame;
|
||||
import javax.swing.JSplitPane;
|
||||
import javax.swing.SwingUtilities;
|
||||
import java.awt.Dimension;
|
||||
import java.awt.Robot;
|
||||
import java.awt.event.ComponentAdapter;
|
||||
import java.awt.event.ComponentEvent;
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @key headful
|
||||
* @summary setExtendedFrame not executed immediately
|
||||
* @run main MaximizeWindowTest
|
||||
*/
|
||||
@SuppressWarnings("serial")
|
||||
public class MaximizeWindowTest extends JFrame {
|
||||
private static JFrame frame;
|
||||
private static final Dimension ORIGINAL_SIZE = new Dimension(200, 200);
|
||||
|
||||
public static void main(String[] arguments) throws Exception {
|
||||
Robot robot = new Robot();
|
||||
try {
|
||||
SwingUtilities.invokeAndWait(() -> {
|
||||
JSplitPane splitPane = new JSplitPane();
|
||||
|
||||
frame = new JFrame();
|
||||
frame.setDefaultCloseOperation(EXIT_ON_CLOSE);
|
||||
frame.setSize(ORIGINAL_SIZE);
|
||||
frame.setLocation(400, 400);
|
||||
frame.add(splitPane);
|
||||
frame.setExtendedState(MAXIMIZED_BOTH);
|
||||
|
||||
frame.addComponentListener(new ComponentAdapter() {
|
||||
@Override
|
||||
public void componentResized(ComponentEvent e) {
|
||||
System.out.println("Component size: " + e.getComponent().getSize());
|
||||
if (e.getComponent().getSize().equals(ORIGINAL_SIZE)) {
|
||||
throw new RuntimeException("Test Failed! " +
|
||||
"Frame was visible at original size before maximizing");
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
splitPane.setDividerLocation(1000);
|
||||
frame.setVisible(true);
|
||||
});
|
||||
|
||||
robot.delay(1000);
|
||||
|
||||
} finally {
|
||||
if (frame != null) {
|
||||
SwingUtilities.invokeAndWait(() -> frame.dispose());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user