Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
363da5d8
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,发现更多精彩内容 >>
提交
363da5d8
编写于
11月 18, 2013
作者:
B
bagiras
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8027628: JWindow jumps to (0, 0) after mouse clicked
Reviewed-by: anthony, serb
上级
401ff5fb
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
201 addition
and
41 deletion
+201
-41
src/solaris/classes/sun/awt/X11/XDecoratedPeer.java
src/solaris/classes/sun/awt/X11/XDecoratedPeer.java
+1
-39
src/solaris/classes/sun/awt/X11/XWindowPeer.java
src/solaris/classes/sun/awt/X11/XWindowPeer.java
+54
-2
test/java/awt/Window/TopLevelLocation/TopLevelLocation.java
test/java/awt/Window/TopLevelLocation/TopLevelLocation.java
+146
-0
未找到文件。
src/solaris/classes/sun/awt/X11/XDecoratedPeer.java
浏览文件 @
363da5d8
...
...
@@ -740,37 +740,7 @@ abstract class XDecoratedPeer extends XWindowPeer {
// Bounds of the window
Rectangle
targetBounds
=
AWTAccessor
.
getComponentAccessor
().
getBounds
((
Component
)
target
);
Point
newLocation
=
targetBounds
.
getLocation
();
if
(
xe
.
get_send_event
()
||
runningWM
==
XWM
.
NO_WM
||
XWM
.
isNonReparentingWM
())
{
// Location, Client size + insets
newLocation
=
new
Point
(
xe
.
get_x
()
-
currentInsets
.
left
,
xe
.
get_y
()
-
currentInsets
.
top
);
}
else
{
// ICCCM 4.1.5 states that a real ConfigureNotify will be sent when
// a window is resized but the client can not tell if the window was
// moved or not. The client should consider the position as unkown
// and use TranslateCoordinates to find the actual position.
//
// TODO this should be the default for every case.
switch
(
XWM
.
getWMID
())
{
case
XWM
.
CDE_WM
:
case
XWM
.
MOTIF_WM
:
case
XWM
.
METACITY_WM
:
case
XWM
.
MUTTER_WM
:
case
XWM
.
SAWFISH_WM
:
{
Point
xlocation
=
queryXLocation
();
if
(
log
.
isLoggable
(
PlatformLogger
.
Level
.
FINE
))
{
log
.
fine
(
"New X location: {0}"
,
xlocation
);
}
if
(
xlocation
!=
null
)
{
newLocation
=
xlocation
;
}
break
;
}
default
:
break
;
}
}
Point
newLocation
=
getNewLocation
(
xe
,
currentInsets
.
left
,
currentInsets
.
top
);
WindowDimensions
newDimensions
=
new
WindowDimensions
(
newLocation
,
...
...
@@ -1261,12 +1231,4 @@ abstract class XDecoratedPeer extends XWindowPeer {
}
super
.
handleWindowFocusOut
(
oppositeWindow
,
serial
);
}
private
Point
queryXLocation
()
{
return
XlibUtil
.
translateCoordinates
(
getContentWindow
(),
XlibWrapper
.
RootWindow
(
XToolkit
.
getDisplay
(),
getScreenNumber
()),
new
Point
(
0
,
0
));
}
}
src/solaris/classes/sun/awt/X11/XWindowPeer.java
浏览文件 @
363da5d8
...
...
@@ -740,15 +740,67 @@ class XWindowPeer extends XPanelPeer implements WindowPeer,
public
void
paletteChanged
()
{
}
private
Point
queryXLocation
()
{
return
XlibUtil
.
translateCoordinates
(
getContentWindow
(),
XlibWrapper
.
RootWindow
(
XToolkit
.
getDisplay
(),
getScreenNumber
()),
new
Point
(
0
,
0
));
}
protected
Point
getNewLocation
(
XConfigureEvent
xe
,
int
leftInset
,
int
topInset
)
{
// Bounds of the window
Rectangle
targetBounds
=
AWTAccessor
.
getComponentAccessor
().
getBounds
((
Component
)
target
);
int
runningWM
=
XWM
.
getWMID
();
Point
newLocation
=
targetBounds
.
getLocation
();
if
(
xe
.
get_send_event
()
||
runningWM
==
XWM
.
NO_WM
||
XWM
.
isNonReparentingWM
())
{
// Location, Client size + insets
newLocation
=
new
Point
(
xe
.
get_x
()
-
leftInset
,
xe
.
get_y
()
-
topInset
);
}
else
{
// ICCCM 4.1.5 states that a real ConfigureNotify will be sent when
// a window is resized but the client can not tell if the window was
// moved or not. The client should consider the position as unkown
// and use TranslateCoordinates to find the actual position.
//
// TODO this should be the default for every case.
switch
(
runningWM
)
{
case
XWM
.
CDE_WM
:
case
XWM
.
MOTIF_WM
:
case
XWM
.
METACITY_WM
:
case
XWM
.
MUTTER_WM
:
case
XWM
.
SAWFISH_WM
:
{
Point
xlocation
=
queryXLocation
();
if
(
log
.
isLoggable
(
PlatformLogger
.
Level
.
FINE
))
{
log
.
fine
(
"New X location: {0}"
,
xlocation
);
}
if
(
xlocation
!=
null
)
{
newLocation
=
xlocation
;
}
break
;
}
default
:
break
;
}
}
return
newLocation
;
}
/*
* Overridden to check if we need to update our GraphicsDevice/Config
* Added for 4934052.
*/
@Override
public
void
handleConfigureNotifyEvent
(
XEvent
xev
)
{
// TODO: We create an XConfigureEvent every time we override
// handleConfigureNotify() - too many!
XConfigureEvent
xe
=
xev
.
get_xconfigure
();
/*
* Correct window location which could be wrong in some cases.
* See getNewLocation() for the details.
*/
Point
newLocation
=
getNewLocation
(
xe
,
0
,
0
);
xe
.
set_x
(
newLocation
.
x
);
xe
.
set_y
(
newLocation
.
y
);
checkIfOnNewScreen
(
new
Rectangle
(
xe
.
get_x
(),
xe
.
get_y
(),
xe
.
get_width
(),
...
...
test/java/awt/Window/TopLevelLocation/TopLevelLocation.java
0 → 100644
浏览文件 @
363da5d8
/*
* 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.
*/
/**
* @test
* @bug 8027628
* @author Oleg Pekhovskiy
* @summary JWindow jumps to (0, 0) after mouse clicked
* @run main TopLevelLocation
*/
import
java.awt.Color
;
import
java.awt.Dimension
;
import
java.awt.EventQueue
;
import
java.awt.Point
;
import
java.awt.Robot
;
import
java.awt.event.MouseAdapter
;
import
java.awt.event.MouseEvent
;
import
javax.swing.JFrame
;
import
javax.swing.JWindow
;
public
class
TopLevelLocation
{
private
static
JFrame
frame
;
private
static
JWindow
window
;
private
static
boolean
passed
=
true
;
public
static
void
main
(
String
[]
args
)
throws
Exception
{
EventQueue
.
invokeAndWait
(()
->
{
frame
=
new
JFrame
();
frame
.
getContentPane
().
setBackground
(
Color
.
PINK
);
frame
.
setBounds
(
100
,
100
,
500
,
400
);
frame
.
setUndecorated
(
true
);
frame
.
setVisible
(
true
);
window
=
new
JWindow
(
frame
);
window
.
setBackground
(
Color
.
BLUE
);
window
.
setAlwaysOnTop
(
true
);
window
.
setBounds
(
200
,
200
,
200
,
200
);
window
.
addMouseListener
(
new
MouseAdapter
()
{
private
Point
dragOrigin
=
null
;
private
Dimension
origSize
=
null
;
private
Point
origLoc
=
null
;
private
Point
lastLoc
=
null
;
private
boolean
left
=
false
;
private
boolean
top
=
false
;
private
boolean
bottom
=
false
;
private
boolean
right
=
false
;
@Override
public
void
mousePressed
(
MouseEvent
e
)
{
System
.
out
.
println
(
"mousePressed"
);
dragOrigin
=
e
.
getLocationOnScreen
();
origSize
=
window
.
getSize
();
origLoc
=
window
.
getLocationOnScreen
();
if
(
lastLoc
!=
null
)
{
System
.
out
.
println
(
"SET LOCATION: "
+
lastLoc
);
System
.
out
.
println
(
"CURRENT LOCATION: "
+
origLoc
);
if
(
lastLoc
.
x
!=
origLoc
.
x
||
lastLoc
.
y
!=
origLoc
.
y
)
{
passed
=
false
;
}
}
right
=
(
origLoc
.
x
+
window
.
getWidth
()
-
dragOrigin
.
x
)
<
5
;
left
=
!
right
&&
dragOrigin
.
x
-
origLoc
.
x
<
5
;
bottom
=
(
origLoc
.
y
+
window
.
getHeight
()
-
dragOrigin
.
y
)
<
5
;
top
=
!
bottom
&&
dragOrigin
.
y
-
origLoc
.
y
<
5
;
}
@Override
public
void
mouseDragged
(
MouseEvent
e
)
{
System
.
out
.
println
(
"mouseDragged"
);
resize
(
e
);
}
@Override
public
void
mouseReleased
(
MouseEvent
e
)
{
System
.
out
.
println
(
"mouseReleased"
);
resize
(
e
);
}
void
resize
(
MouseEvent
e
)
{
Point
dragDelta
=
e
.
getLocationOnScreen
();
dragDelta
.
translate
(-
dragOrigin
.
x
,
-
dragOrigin
.
y
);
Point
newLoc
=
new
Point
(
origLoc
);
newLoc
.
translate
(
dragDelta
.
x
,
dragDelta
.
y
);
Dimension
newSize
=
new
Dimension
(
origSize
);
if
(
left
||
right
)
{
newSize
.
width
+=
right
?
dragDelta
.
x
:
-
dragDelta
.
x
;
}
if
(
top
||
bottom
)
{
newSize
.
height
+=
bottom
?
dragDelta
.
y
:
-
dragDelta
.
y
;
}
if
(
right
||
(
top
||
bottom
)
&&
!
left
)
{
newLoc
.
x
=
origLoc
.
x
;
}
if
(
bottom
||
(
left
||
right
)
&&
!
top
)
{
newLoc
.
y
=
origLoc
.
y
;
}
window
.
setBounds
(
newLoc
.
x
,
newLoc
.
y
,
newSize
.
width
,
newSize
.
height
);
lastLoc
=
newLoc
;
}
});
window
.
setVisible
(
true
);
});
Thread
.
sleep
(
500
);
Dimension
size
=
window
.
getSize
();
Point
location
=
window
.
getLocation
();
Robot
robot
=
new
Robot
();
robot
.
setAutoDelay
(
200
);
robot
.
setAutoWaitForIdle
(
true
);
robot
.
waitForIdle
();
robot
.
mouseMove
(
location
.
x
+
size
.
height
-
2
,
location
.
y
+
size
.
width
-
2
);
robot
.
mousePress
(
MouseEvent
.
BUTTON1_DOWN_MASK
);
robot
.
mouseMove
(
location
.
x
+
size
.
height
,
location
.
y
+
size
.
width
);
robot
.
mouseRelease
(
MouseEvent
.
BUTTON1_DOWN_MASK
);
robot
.
mousePress
(
MouseEvent
.
BUTTON1_DOWN_MASK
);
robot
.
mouseMove
(
location
.
x
+
size
.
height
+
2
,
location
.
y
+
size
.
width
+
2
);
robot
.
mouseRelease
(
MouseEvent
.
BUTTON1_DOWN_MASK
);
Thread
.
sleep
(
500
);
frame
.
dispose
();
if
(!
passed
)
{
throw
new
RuntimeException
(
"TEST FAILED: Location doesn't match!"
);
}
System
.
out
.
println
(
"TEST PASSED!"
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录