Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
10c9e7df
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,发现更多精彩内容 >>
提交
10c9e7df
编写于
9月 13, 2013
作者:
P
pchelko
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8012026: [macosx] Component.getMousePosition() does not work in an applet on MacOS
Reviewed-by: anthony, serb
上级
35d7d35c
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
220 addition
and
52 deletion
+220
-52
make/sun/lwawt/FILES_export_macosx.gmk
make/sun/lwawt/FILES_export_macosx.gmk
+0
-1
src/macosx/classes/sun/lwawt/macosx/CMouseInfoPeer.java
src/macosx/classes/sun/lwawt/macosx/CMouseInfoPeer.java
+0
-45
src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java
src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java
+0
-5
src/macosx/native/sun/awt/AWTView.m
src/macosx/native/sun/awt/AWTView.m
+1
-1
test/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithOverlay.java
...use/GetMousePositionTest/GetMousePositionWithOverlay.java
+108
-0
test/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java
...Mouse/GetMousePositionTest/GetMousePositionWithPopup.java
+111
-0
未找到文件。
make/sun/lwawt/FILES_export_macosx.gmk
浏览文件 @
10c9e7df
...
...
@@ -141,7 +141,6 @@ FILES_export = \
sun/lwawt/macosx/CMenuBar.java \
sun/lwawt/macosx/CMenuComponent.java \
sun/lwawt/macosx/CMenuItem.java \
sun/lwawt/macosx/CMouseInfoPeer.java \
sun/lwawt/macosx/CPlatformView.java \
sun/lwawt/macosx/CPlatformWindow.java \
sun/lwawt/macosx/CWarningWindow.java \
...
...
src/macosx/classes/sun/lwawt/macosx/CMouseInfoPeer.java
已删除
100644 → 0
浏览文件 @
35d7d35c
/*
* Copyright (c) 2011, 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. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* 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.
*/
package
sun.lwawt.macosx
;
import
java.awt.Window
;
import
sun.lwawt.LWMouseInfoPeer
;
import
sun.lwawt.LWWindowPeer
;
public
class
CMouseInfoPeer
extends
LWMouseInfoPeer
{
//If a new window is to appear under the cursor,
//we get wrong window.
//This is a workaround for macosx.
@Override
public
boolean
isWindowUnderMouse
(
Window
w
)
{
if
(
w
==
null
)
{
return
false
;
}
return
((
LWWindowPeer
)
w
.
getPeer
()).
getPlatformWindow
().
isUnderMouse
();
}
}
src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java
浏览文件 @
10c9e7df
...
...
@@ -302,11 +302,6 @@ public final class LWCToolkit extends LWToolkit {
return
new
OSXPlatformFont
(
name
,
style
);
}
@Override
protected
MouseInfoPeer
createMouseInfoPeerImpl
()
{
return
new
CMouseInfoPeer
();
}
@Override
protected
int
getScreenHeight
()
{
return
GraphicsEnvironment
.
getLocalGraphicsEnvironment
()
...
...
src/macosx/native/sun/awt/AWTView.m
浏览文件 @
10c9e7df
...
...
@@ -387,7 +387,7 @@ AWT_ASSERT_APPKIT_THREAD;
[
rolloverTrackingArea
release
];
}
int
options
=
(
NSTrackingActive
InActiveApp
|
NSTrackingMouseEnteredAndExited
|
int
options
=
(
NSTrackingActive
Always
|
NSTrackingMouseEnteredAndExited
|
NSTrackingMouseMoved
|
NSTrackingEnabledDuringMouseDrag
);
rolloverTrackingArea
=
[[
NSTrackingArea
alloc
]
initWithRect
:[
self
visibleRect
]
...
...
test/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithOverlay.java
0 → 100644
浏览文件 @
10c9e7df
/*
* 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
test.java.awt.regtesthelpers.Util
;
import
javax.swing.*
;
import
java.awt.*
;
import
java.util.concurrent.atomic.AtomicReference
;
/**
* @test
* @bug 8012026
* @summary Component.getMousePosition() does not work in an applet on MacOS
* @author Petr Pchelko
* @library ../../regtesthelpers
* @build Util
* @compile GetMousePositionWithOverlay.java
* @run main/othervm GetMousePositionWithOverlay
*/
public
class
GetMousePositionWithOverlay
{
static
Frame
backFrame
;
static
Frame
frontFrame
;
public
static
void
main
(
String
[]
args
)
throws
Throwable
{
try
{
SwingUtilities
.
invokeAndWait
(
new
Runnable
()
{
@Override
public
void
run
()
{
constructTestUI
();
}
});
Util
.
waitForIdle
(
null
);
Robot
r
=
new
Robot
();
Util
.
pointOnComp
(
frontFrame
,
r
);
Util
.
waitForIdle
(
null
);
Point
pos
=
getMousePosition
(
backFrame
);
if
(
pos
!=
null
)
{
throw
new
RuntimeException
(
"Test failed. Mouse position should be null but was"
+
pos
);
}
pos
=
getMousePosition
(
frontFrame
);
if
(
pos
==
null
)
{
throw
new
RuntimeException
(
"Test failed. Mouse position should not be null"
);
}
r
.
mouseMove
(
189
,
189
);
Util
.
waitForIdle
(
null
);
pos
=
getMousePosition
(
backFrame
);
if
(
pos
==
null
)
{
throw
new
RuntimeException
(
"Test failed. Mouse position should not be null"
);
}
}
finally
{
SwingUtilities
.
invokeLater
(
new
Runnable
()
{
@Override
public
void
run
()
{
backFrame
.
dispose
();
frontFrame
.
dispose
();
}
});
}
}
private
static
Point
getMousePosition
(
final
Component
component
)
throws
Exception
{
final
AtomicReference
<
Point
>
pos
=
new
AtomicReference
<
Point
>();
SwingUtilities
.
invokeAndWait
(
new
Runnable
()
{
@Override
public
void
run
()
{
pos
.
set
(
component
.
getMousePosition
());
}
});
return
pos
.
get
();
}
private
static
void
constructTestUI
()
{
backFrame
=
new
Frame
();
backFrame
.
setBounds
(
100
,
100
,
100
,
100
);
backFrame
.
setVisible
(
true
);
frontFrame
=
new
Frame
();
frontFrame
.
setBounds
(
120
,
120
,
60
,
60
);
frontFrame
.
setVisible
(
true
);
}
}
test/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java
0 → 100644
浏览文件 @
10c9e7df
/*
* 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
test.java.awt.regtesthelpers.Util
;
import
javax.swing.*
;
import
java.awt.*
;
import
java.awt.event.MouseEvent
;
import
java.awt.event.MouseMotionAdapter
;
/**
* @test
* @bug 8012026
* @summary Component.getMousePosition() does not work in an applet on MacOS
* @author Petr Pchelko
* @library ../../regtesthelpers
* @build Util
* @compile GetMousePositionWithPopup.java
* @run main/othervm GetMousePositionWithPopup
*/
public
class
GetMousePositionWithPopup
{
private
static
Frame
frame1
;
private
static
Frame
frame2
;
public
static
void
main
(
String
[]
args
)
throws
Exception
{
try
{
Robot
r
=
Util
.
createRobot
();
r
.
mouseMove
(
0
,
0
);
Util
.
waitForIdle
(
null
);
SwingUtilities
.
invokeAndWait
(
new
Runnable
()
{
@Override
public
void
run
()
{
constructTestUI
();
}
});
Util
.
waitForIdle
(
null
);
r
.
mouseMove
(
149
,
149
);
Util
.
waitForIdle
(
null
);
r
.
mouseMove
(
150
,
150
);
Util
.
waitForIdle
(
null
);
}
finally
{
SwingUtilities
.
invokeLater
(
new
Runnable
()
{
@Override
public
void
run
()
{
frame1
.
dispose
();
frame2
.
dispose
();
}
});
}
}
private
static
void
constructTestUI
()
{
frame1
=
new
Frame
();
frame1
.
setBounds
(
100
,
100
,
100
,
100
);
frame1
.
addMouseMotionListener
(
new
MouseMotionAdapter
()
{
private
boolean
shown
=
false
;
@Override
public
void
mouseMoved
(
MouseEvent
e
)
{
if
(
shown
)
{
return
;
}
shown
=
true
;
frame2
=
new
Frame
();
frame2
.
setBounds
(
120
,
120
,
120
,
120
);
frame2
.
setVisible
(
true
);
Point
positionInFrame2
=
frame2
.
getMousePosition
();
if
(
positionInFrame2
.
x
!=
30
||
positionInFrame2
.
y
!=
30
)
{
throw
new
RuntimeException
(
"Wrong position reported. Should be [30, 30] but was ["
+
positionInFrame2
.
x
+
", "
+
positionInFrame2
.
y
+
"]"
);
}
Point
positionInFrame1
=
frame1
.
getMousePosition
();
if
(
positionInFrame1
!=
null
)
{
throw
new
RuntimeException
(
"Wrong position reported. Should be null"
);
}
}
});
frame1
.
setVisible
(
true
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录