提交 fb8c0e62 编写于 作者: D dmarkov

8213983: [macosx] Keyboard shortcut “cmd +`” stops working properly if popup window is displayed

Reviewed-by: kaddepalli, serb
上级 b3a860d8
......@@ -1131,27 +1131,18 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
}
private void orderAboveSiblings() {
CPlatformWindow rootOwner = getRootOwner();
// Do not order child windows of iconified owner.
if (!rootOwner.isIconified()) {
final WindowAccessor windowAccessor = AWTAccessor.getWindowAccessor();
Window[] windows = windowAccessor.getOwnedWindows(rootOwner.target);
// No need to order windows if it doesn't own other windows and hence return
if (windows.length == 0) {
return;
}
// Recursively pop up the windows from the very bottom, (i.e. root owner) so that
// the windows are ordered above their nearest owner; ancestors of the window,
// which is going to become 'main window', are placed above their siblings.
if (rootOwner.isVisible()) {
CPlatformWindow rootOwner = getRootOwner();
if (rootOwner.isVisible() && !rootOwner.isIconified() && !rootOwner.isActive()) {
rootOwner.execute(CWrapper.NSWindow::orderFront);
}
// Order child windows.
orderAboveSiblingsImpl(windows);
// Do not order child windows of iconified owner.
if (!rootOwner.isIconified()) {
final WindowAccessor windowAccessor = AWTAccessor.getWindowAccessor();
orderAboveSiblingsImpl(windowAccessor.getOwnedWindows(rootOwner.target));
}
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册