Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
07405dd1
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
4
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看板
提交
07405dd1
编写于
1月 18, 2017
作者:
A
asaha
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8173031: Temporary backout fix #8171952 from 8u131-b03
Reviewed-by: dmarkov
上级
e181874c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
2 addition
and
107 deletion
+2
-107
src/macosx/native/sun/awt/AWTWindow.m
src/macosx/native/sun/awt/AWTWindow.m
+2
-36
test/java/awt/Frame/ObscuredFrame/ObscuredFrameTest.java
test/java/awt/Frame/ObscuredFrame/ObscuredFrameTest.java
+0
-71
未找到文件。
src/macosx/native/sun/awt/AWTWindow.m
浏览文件 @
07405dd1
...
...
@@ -326,44 +326,10 @@ AWT_ASSERT_APPKIT_THREAD;
return
[
window
isKindOfClass
:
[
AWTWindow_Panel
class
]]
||
[
window
isKindOfClass
:
[
AWTWindow_Normal
class
]];
}
// Retrieves the list of possible window layers (levels)
+
(
NSArray
*
)
getWindowLayers
{
static
NSArray
*
windowLayers
;
static
dispatch_once_t
token
;
// Initialize the list of possible window layers
dispatch_once
(
&
token
,
^
{
// The layers are ordered from front to back, (i.e. the toppest one is the first)
windowLayers
=
[
NSArray
arrayWithObjects
:
[
NSNumber
numberWithInt
:
CGWindowLevelForKey
(
kCGPopUpMenuWindowLevelKey
)],
[
NSNumber
numberWithInt
:
CGWindowLevelForKey
(
kCGFloatingWindowLevelKey
)],
[
NSNumber
numberWithInt
:
CGWindowLevelForKey
(
kCGNormalWindowLevelKey
)],
nil
];
[
windowLayers
retain
];
});
return
windowLayers
;
}
// returns id for the topmost window under mouse
+
(
NSInteger
)
getTopmostWindowUnderMouseID
{
NSInteger
result
=
-
1
;
NSArray
*
windowLayers
=
[
AWTWindow
getWindowLayers
];
// Looking for the window under mouse starting from the toppest layer
for
(
NSNumber
*
layer
in
windowLayers
)
{
result
=
[
AWTWindow
getTopmostWindowUnderMouseIDImpl
:[
layer
integerValue
]];
if
(
result
!=
-
1
)
{
break
;
}
}
return
result
;
}
+
(
NSInteger
)
getTopmostWindowUnderMouseIDImpl
:(
NSInteger
)
windowLayer
{
NSInteger
result
=
-
1
;
NSRect
screenRect
=
[[
NSScreen
mainScreen
]
frame
];
NSPoint
nsMouseLocation
=
[
NSEvent
mouseLocation
];
CGPoint
cgMouseLocation
=
CGPointMake
(
nsMouseLocation
.
x
,
screenRect
.
size
.
height
-
nsMouseLocation
.
y
);
...
...
@@ -372,7 +338,7 @@ AWT_ASSERT_APPKIT_THREAD;
for
(
NSDictionary
*
window
in
windows
)
{
NSInteger
layer
=
[[
window
objectForKey
:(
id
)
kCGWindowLayer
]
integerValue
];
if
(
layer
==
windowLayer
)
{
if
(
layer
==
0
)
{
CGRect
rect
;
CGRectMakeWithDictionaryRepresentation
((
CFDictionaryRef
)[
window
objectForKey
:(
id
)
kCGWindowBounds
],
&
rect
);
if
(
CGRectContainsPoint
(
rect
,
cgMouseLocation
))
{
...
...
test/java/awt/Frame/ObscuredFrame/ObscuredFrameTest.java
已删除
100644 → 0
浏览文件 @
e181874c
/*
* 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 8171952
* @summary Tests that getMousePosition() returns null for obscured component.
* @author Dmitry Markov
* @library ../../regtesthelpers
* @build Util
* @run main ObscuredFrameTest
*/
import
java.awt.*
;
import
test.java.awt.regtesthelpers.Util
;
public
class
ObscuredFrameTest
{
public
static
void
main
(
String
[]
args
)
{
Robot
robot
=
Util
.
createRobot
();
Frame
frame
=
new
Frame
(
"Obscured Frame"
);
frame
.
setSize
(
200
,
200
);
frame
.
setLocationRelativeTo
(
null
);
Button
button
=
new
Button
(
"Button"
);
frame
.
add
(
button
);
Dialog
dialog
=
new
Dialog
(
frame
,
"Visible Dialog"
,
false
);
dialog
.
setSize
(
200
,
200
);
dialog
.
setLocationRelativeTo
(
null
);
dialog
.
setVisible
(
true
);
frame
.
setVisible
(
true
);
Util
.
waitForIdle
(
robot
);
Util
.
pointOnComp
(
button
,
robot
);
Util
.
waitForIdle
(
robot
);
robot
.
delay
(
2000
);
try
{
if
(
button
.
getMousePosition
()
!=
null
)
{
throw
new
RuntimeException
(
"Test Failed! Mouse position is not null for obscured component."
);
}
}
finally
{
frame
.
dispose
();
dialog
.
dispose
();
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录