stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

7081594: Windows owned by an always-on-top window DO NOT automatically become always-on-top

Browse Source 
Reviewed-by: art, anthony, serb
This commit is contained in:
Alexander Scherbatiy 2013-10-08 18:45:38 +04:00
parent a485f88ad9
commit 9a9e0fd42c
2 changed files with 106 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
jdk/src/share/classes/java/awt/Window.java
View File

@ -630,6 +630,12 @@ public class Window extends Container implements Accessible {
this.parent = owner; this.parent = owner;
if (owner != null) { if (owner != null) {
owner.addOwnedWindow(weakThis); owner.addOwnedWindow(weakThis);
if (owner.isAlwaysOnTop()) {
try {
setAlwaysOnTop(true);
} catch (SecurityException ignore) {
}
}
} }
// WindowDisposerRecord requires a proper value of parent field. // WindowDisposerRecord requires a proper value of parent field.
@ -2243,6 +2249,15 @@ public class Window extends Container implements Accessible {
} }
firePropertyChange("alwaysOnTop", oldAlwaysOnTop, alwaysOnTop); firePropertyChange("alwaysOnTop", oldAlwaysOnTop, alwaysOnTop);
} }
for (WeakReference<Window> ref : ownedWindowList) {
Window window = ref.get();
if (window != null) {
try {
window.setAlwaysOnTop(alwaysOnTop);
} catch (SecurityException ignore) {
}
}
}
} }
/** /**

91
jdk/test/java/awt/Window/AlwaysOnTop/AlwaysOnTopFieldTest.java Normal file
View File

@ -0,0 +1,91 @@
/*
* 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.Dialog;
import java.awt.Frame;
import java.awt.Toolkit;
import java.awt.Window;
import sun.awt.SunToolkit;
/**
* @test
* @bug 7081594
* @author Alexander Scherbatiy
* @summary Windows owned by an always-on-top window DO NOT automatically become always-on-top
* @run main AlwaysOnTopFieldTest
*/
public class AlwaysOnTopFieldTest {
public static void main(String[] args) {
SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
Window window = new Frame("Window 1");
window.setSize(200, 200);
window.setAlwaysOnTop(true);
window.setVisible(true);
toolkit.realSync();
Dialog dialog = new Dialog(window, "Owned dialog 1");
dialog.setSize(200, 200);
dialog.setLocation(100, 100);
dialog.setVisible(true);
toolkit.realSync();
try {
if (!window.isAlwaysOnTop()) {
throw new RuntimeException("Window has wrong isAlwaysOnTop value");
}
if (!dialog.isAlwaysOnTop()) {
throw new RuntimeException("Dialog has wrong isAlwaysOnTop value");
}
} finally {
window.dispose();
dialog.dispose();
}
window = new Frame("Window 2");
window.setSize(200, 200);
window.setVisible(true);
toolkit.realSync();
dialog = new Dialog(window, "Owned dialog 2");
dialog.setSize(200, 200);
dialog.setLocation(100, 100);
dialog.setVisible(true);
toolkit.realSync();
window.setAlwaysOnTop(true);
toolkit.realSync();
try {
if (!window.isAlwaysOnTop()) {
throw new RuntimeException("Window has wrong isAlwaysOnTop value");
}
if (!dialog.isAlwaysOnTop()) {
throw new RuntimeException("Dialog has wrong isAlwaysOnTop value");
}
} finally {
window.dispose();
dialog.dispose();
}
}
}