Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
783f465d
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
3
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_jdk
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
783f465d
编写于
12月 09, 2016
作者:
D
dmarkov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8169589: [macosx] Activating a JDialog puts to back another dialog
Reviewed-by: aivanov, serb
上级
073a1d17
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
155 addition
and
19 deletion
+155
-19
src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
+64
-19
src/share/classes/java/awt/Window.java
src/share/classes/java/awt/Window.java
+4
-0
src/share/classes/sun/awt/AWTAccessor.java
src/share/classes/sun/awt/AWTAccessor.java
+6
-0
test/java/awt/Dialog/DialogAboveFrame/DialogAboveFrameTest.java
...ava/awt/Dialog/DialogAboveFrame/DialogAboveFrameTest.java
+81
-0
未找到文件。
src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
浏览文件 @
783f465d
...
...
@@ -31,12 +31,16 @@ import java.awt.event.*;
import
java.awt.peer.WindowPeer
;
import
java.beans.*
;
import
java.lang.reflect.InvocationTargetException
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.List
;
import
java.util.Objects
;
import
javax.swing.*
;
import
sun.awt.*
;
import
sun.awt.AWTAccessor.ComponentAccessor
;
import
sun.awt.AWTAccessor.WindowAccessor
;
import
sun.java2d.SurfaceData
;
import
sun.java2d.opengl.CGLSurfaceData
;
import
sun.lwawt.*
;
...
...
@@ -1015,29 +1019,70 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
return
true
;
}
private
void
orderAboveSiblings
()
{
if
(
owner
==
null
)
{
return
;
private
boolean
isOneOfOwnersOrSelf
(
CPlatformWindow
window
)
{
while
(
window
!=
null
)
{
if
(
this
==
window
)
{
return
true
;
}
window
=
window
.
owner
;
}
return
false
;
}
// NOTE: the logic will fail if we have a hierarchy like:
// visible root owner
// invisible owner
// visible dialog
// However, this is an unlikely scenario for real life apps
if
(
owner
.
isVisible
())
{
// Recursively pop up the windows from the very bottom so that only
// the very top-most one becomes the main window
owner
.
orderAboveSiblings
();
// Order the window to front of the stack of child windows
final
long
nsWindowSelfPtr
=
getNSWindowPtr
();
final
long
nsWindowOwnerPtr
=
owner
.
getNSWindowPtr
();
CWrapper
.
NSWindow
.
orderFront
(
nsWindowOwnerPtr
);
CWrapper
.
NSWindow
.
orderWindow
(
nsWindowSelfPtr
,
CWrapper
.
NSWindow
.
NSWindowAbove
,
nsWindowOwnerPtr
);
private
CPlatformWindow
getRootOwner
()
{
CPlatformWindow
rootOwner
=
this
;
while
(
rootOwner
.
owner
!=
null
)
{
rootOwner
=
rootOwner
.
owner
;
}
return
rootOwner
;
}
applyWindowLevel
(
target
);
private
void
orderAboveSiblings
()
{
// 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.
CPlatformWindow
rootOwner
=
getRootOwner
();
if
(
rootOwner
.
isVisible
())
{
CWrapper
.
NSWindow
.
orderFront
(
rootOwner
.
getNSWindowPtr
());
}
final
WindowAccessor
windowAccessor
=
AWTAccessor
.
getWindowAccessor
();
orderAboveSiblingsImpl
(
windowAccessor
.
getOwnedWindows
(
rootOwner
.
target
));
}
private
void
orderAboveSiblingsImpl
(
Window
[]
windows
)
{
ArrayList
<
Window
>
childWindows
=
new
ArrayList
<
Window
>();
final
ComponentAccessor
componentAccessor
=
AWTAccessor
.
getComponentAccessor
();
final
WindowAccessor
windowAccessor
=
AWTAccessor
.
getWindowAccessor
();
// Go through the list of windows and perform ordering.
for
(
Window
w
:
windows
)
{
final
Object
p
=
componentAccessor
.
getPeer
(
w
);
if
(
p
instanceof
LWWindowPeer
)
{
CPlatformWindow
pw
=
(
CPlatformWindow
)((
LWWindowPeer
)
p
).
getPlatformWindow
();
if
(
pw
!=
null
&&
pw
.
isVisible
())
{
// If the window is one of ancestors of 'main window' or is going to become main by itself,
// the window should be ordered above its siblings; otherwise the window is just ordered
// above its nearest parent.
if
(
pw
.
isOneOfOwnersOrSelf
(
this
))
{
CWrapper
.
NSWindow
.
orderFront
(
pw
.
getNSWindowPtr
());
}
else
{
CWrapper
.
NSWindow
.
orderWindow
(
pw
.
getNSWindowPtr
(),
CWrapper
.
NSWindow
.
NSWindowAbove
,
pw
.
owner
.
getNSWindowPtr
());
}
pw
.
applyWindowLevel
(
w
);
}
}
// Retrieve the child windows for each window from the list and store them for future use.
// Note: we collect data about child windows even for invisible owners, since they may have
// visible children.
childWindows
.
addAll
(
Arrays
.
asList
(
windowAccessor
.
getOwnedWindows
(
w
)));
}
// If some windows, which have just been ordered, have any child windows, let's start new iteration
// and order these child windows.
if
(!
childWindows
.
isEmpty
())
{
orderAboveSiblingsImpl
(
childWindows
.
toArray
(
new
Window
[
0
]));
}
}
protected
void
applyWindowLevel
(
Window
target
)
{
...
...
src/share/classes/java/awt/Window.java
浏览文件 @
783f465d
...
...
@@ -4100,6 +4100,10 @@ public class Window extends Container implements Accessible {
public
void
setTrayIconWindow
(
Window
w
,
boolean
isTrayIconWindow
)
{
w
.
isTrayIconWindow
=
isTrayIconWindow
;
}
public
Window
[]
getOwnedWindows
(
Window
w
)
{
return
w
.
getOwnedWindows_NoClientCode
();
}
});
// WindowAccessor
}
// static
...
...
src/share/classes/sun/awt/AWTAccessor.java
浏览文件 @
783f465d
...
...
@@ -333,6 +333,12 @@ public final class AWTAccessor {
* Marks the specified window as an utility window for TrayIcon.
*/
void
setTrayIconWindow
(
Window
w
,
boolean
isTrayIconWindow
);
/**
* Return an array containing all the windows this
* window currently owns.
*/
Window
[]
getOwnedWindows
(
Window
w
);
}
/**
...
...
test/java/awt/Dialog/DialogAboveFrame/DialogAboveFrameTest.java
0 → 100644
浏览文件 @
783f465d
/*
* Copyright (c) 2016, 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 8169589
* @summary Activating a dialog puts to back another dialog owned by the same frame
* @author Dmitry Markov
* @library ../../regtesthelpers
* @build Util
* @run main DialogAboveFrameTest
*/
import
java.awt.Color
;
import
java.awt.Dialog
;
import
java.awt.Frame
;
import
java.awt.Point
;
import
java.awt.Robot
;
import
test.java.awt.regtesthelpers.Util
;
public
class
DialogAboveFrameTest
{
public
static
void
main
(
String
[]
args
)
{
Robot
robot
=
Util
.
createRobot
();
Frame
frame
=
new
Frame
(
"Frame"
);
frame
.
setBackground
(
Color
.
BLUE
);
frame
.
setBounds
(
200
,
50
,
300
,
300
);
frame
.
setVisible
(
true
);
Dialog
dialog1
=
new
Dialog
(
frame
,
"Dialog 1"
,
false
);
dialog1
.
setBackground
(
Color
.
RED
);
dialog1
.
setBounds
(
100
,
100
,
200
,
200
);
dialog1
.
setVisible
(
true
);
Dialog
dialog2
=
new
Dialog
(
frame
,
"Dialog 2"
,
false
);
dialog2
.
setBackground
(
Color
.
GREEN
);
dialog2
.
setBounds
(
400
,
100
,
200
,
200
);
dialog2
.
setVisible
(
true
);
Util
.
waitForIdle
(
robot
);
Util
.
clickOnComp
(
dialog2
,
robot
);
Util
.
waitForIdle
(
robot
);
Point
point
=
dialog1
.
getLocationOnScreen
();
int
x
=
point
.
x
+
(
int
)(
dialog1
.
getWidth
()
*
0.9
);
int
y
=
point
.
y
+
(
int
)(
dialog1
.
getHeight
()
*
0.9
);
try
{
if
(!
robot
.
getPixelColor
(
x
,
y
).
equals
(
dialog1
.
getBackground
()))
{
throw
new
RuntimeException
(
"Test FAILED: Dialog is behind the frame"
);
}
}
finally
{
frame
.
dispose
();
dialog1
.
dispose
();
dialog2
.
dispose
();
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录