Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
9ff54716
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看板
提交
9ff54716
编写于
6月 12, 2008
作者:
T
tbell
浏览文件
操作
浏览文件
下载
差异文件
Merge
上级
af4b6955
bd6778c9
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
42 addition
and
5 deletion
+42
-5
.hgtags
.hgtags
+1
-0
src/share/classes/java/awt/Component.java
src/share/classes/java/awt/Component.java
+16
-2
src/share/classes/java/awt/dnd/DragSourceContext.java
src/share/classes/java/awt/dnd/DragSourceContext.java
+5
-2
src/windows/native/sun/windows/awt_Component.cpp
src/windows/native/sun/windows/awt_Component.cpp
+19
-1
src/windows/native/sun/windows/awt_Component.h
src/windows/native/sun/windows/awt_Component.h
+1
-0
未找到文件。
.hgtags
浏览文件 @
9ff54716
...
...
@@ -2,3 +2,4 @@
75fca0b0ab83ab1392e615910cea020f66535390 jdk7-b25
fb57027902e04ecafceae31a605e69b436c23d57 jdk7-b26
3e599d98875ddf919c8ea11cff9b3a99ba631a9b jdk7-b27
02e4c5348592a8d7fc2cba28bc5f8e35c0e17277 jdk7-b28
src/share/classes/java/awt/Component.java
浏览文件 @
9ff54716
...
...
@@ -3057,10 +3057,24 @@ public abstract class Component implements ImageObserver, MenuContainer,
// services. Additionally, the request is restricted to
// the bounds of the component.
if
(
parent
!=
null
)
{
int
px
=
this
.
x
+
((
x
<
0
)
?
0
:
x
);
int
py
=
this
.
y
+
((
y
<
0
)
?
0
:
y
);
if
(
x
<
0
)
{
width
+=
x
;
x
=
0
;
}
if
(
y
<
0
)
{
height
+=
y
;
y
=
0
;
}
int
pwidth
=
(
width
>
this
.
width
)
?
this
.
width
:
width
;
int
pheight
=
(
height
>
this
.
height
)
?
this
.
height
:
height
;
if
(
pwidth
<=
0
||
pheight
<=
0
)
{
return
;
}
int
px
=
this
.
x
+
x
;
int
py
=
this
.
y
+
y
;
parent
.
repaint
(
tm
,
px
,
py
,
pwidth
,
pheight
);
}
}
else
{
...
...
src/share/classes/java/awt/dnd/DragSourceContext.java
浏览文件 @
9ff54716
/*
* Copyright 1997-200
7
Sun Microsystems, Inc. All Rights Reserved.
* Copyright 1997-200
8
Sun Microsystems, Inc. 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
...
...
@@ -485,7 +485,6 @@ public class DragSourceContext
Cursor
c
=
null
;
targetAct
=
DnDConstants
.
ACTION_NONE
;
switch
(
status
)
{
case
ENTER:
case
OVER:
...
...
@@ -507,6 +506,10 @@ public class DragSourceContext
else
c
=
DragSource
.
DefaultCopyDrop
;
}
break
;
default
:
targetAct
=
DnDConstants
.
ACTION_NONE
;
}
setCursorImpl
(
c
);
...
...
src/windows/native/sun/windows/awt_Component.cpp
浏览文件 @
9ff54716
...
...
@@ -3464,6 +3464,21 @@ UINT AwtComponent::WindowsKeyToJavaKey(UINT windowsKey, UINT modifiers)
return
java_awt_event_KeyEvent_VK_UNDEFINED
;
}
BOOL
AwtComponent
::
IsNavigationKey
(
UINT
wkey
)
{
switch
(
wkey
)
{
case
VK_END
:
case
VK_PRIOR
:
// PageUp
case
VK_NEXT
:
// PageDown
case
VK_HOME
:
case
VK_LEFT
:
case
VK_UP
:
case
VK_RIGHT
:
case
VK_DOWN
:
return
TRUE
;
}
return
FALSE
;
}
// determine if a key is a numpad key (distinguishes the numpad
// arrow keys from the non-numpad arrow keys, for example).
BOOL
AwtComponent
::
IsNumPadKey
(
UINT
vkey
,
BOOL
extended
)
...
...
@@ -3563,7 +3578,10 @@ UINT AwtComponent::WindowsKeyToJavaChar(UINT wkey, UINT modifiers, TransOps ops)
// fix for 4623376,4737679,4501485,4740906,4708221 (4173679/4122715)
// Here we try to resolve a conflict with ::ToAsciiEx's translating
// ALT+number key combinations. kdm@sarc.spb.su
keyboardState
[
VK_MENU
]
&=
~
KEY_STATE_DOWN
;
// yan: Do it for navigation keys only, otherwise some AltGr deadkeys fail.
if
(
IsNavigationKey
(
wkey
)
)
{
keyboardState
[
VK_MENU
]
&=
~
KEY_STATE_DOWN
;
}
if
(
ctrlIsDown
)
{
...
...
src/windows/native/sun/windows/awt_Component.h
浏览文件 @
9ff54716
...
...
@@ -823,6 +823,7 @@ public:
private:
AwtComponent
*
SearchChild
(
UINT
id
);
void
RemoveChild
(
UINT
id
)
;
static
BOOL
IsNavigationKey
(
UINT
wkey
);
ChildListItem
*
m_childList
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录