Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
5393dadc
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看板
提交
5393dadc
编写于
3月 18, 2013
作者:
S
serb
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8000435: [macosx] Button painting error under Java 7 on Mac
Reviewed-by: denis, alexsch
上级
0c552d3b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
31 addition
and
26 deletion
+31
-26
src/macosx/classes/com/apple/laf/AquaButtonBorder.java
src/macosx/classes/com/apple/laf/AquaButtonBorder.java
+7
-2
src/macosx/classes/com/apple/laf/AquaButtonExtendedTypes.java
...macosx/classes/com/apple/laf/AquaButtonExtendedTypes.java
+24
-24
未找到文件。
src/macosx/classes/com/apple/laf/AquaButtonBorder.java
浏览文件 @
5393dadc
...
@@ -83,14 +83,19 @@ public abstract class AquaButtonBorder extends AquaBorder implements Border, UIR
...
@@ -83,14 +83,19 @@ public abstract class AquaButtonBorder extends AquaBorder implements Border, UIR
painter
.
state
.
set
(
state
);
painter
.
state
.
set
(
state
);
painter
.
state
.
set
((
state
!=
State
.
DISABLED
&&
state
!=
State
.
INACTIVE
)
&&
b
.
isFocusPainted
()
&&
isFocused
(
b
)
?
Focused
.
YES
:
Focused
.
NO
);
painter
.
state
.
set
((
state
!=
State
.
DISABLED
&&
state
!=
State
.
INACTIVE
)
&&
b
.
isFocusPainted
()
&&
isFocused
(
b
)
?
Focused
.
YES
:
Focused
.
NO
);
// Full border size of the component.
// g.setColor(new Color(0, 255, 0, 70));
// g.drawRect(x, y, width - 1, height - 1);
final
Insets
subInsets
=
sizeVariant
.
insets
;
final
Insets
subInsets
=
sizeVariant
.
insets
;
x
+=
subInsets
.
left
;
x
+=
subInsets
.
left
;
y
+=
subInsets
.
top
;
y
+=
subInsets
.
top
;
width
-=
(
subInsets
.
left
+
subInsets
.
right
);
width
-=
(
subInsets
.
left
+
subInsets
.
right
);
height
-=
(
subInsets
.
top
+
subInsets
.
bottom
);
height
-=
(
subInsets
.
top
+
subInsets
.
bottom
);
// g.setColor(Color.magenta);
// Where the native border should start to paint.
// g.drawRect(x, y, width - 1, height - 1);
// g.setColor(new Color(255, 0, 255, 70));
// g.drawRect(x, y, width - 1, height - 1);
doButtonPaint
(
b
,
model
,
g
,
x
,
y
,
width
,
height
);
doButtonPaint
(
b
,
model
,
g
,
x
,
y
,
width
,
height
);
}
}
...
...
src/macosx/classes/com/apple/laf/AquaButtonExtendedTypes.java
浏览文件 @
5393dadc
...
@@ -184,30 +184,30 @@ public class AquaButtonExtendedTypes {
...
@@ -184,30 +184,30 @@ public class AquaButtonExtendedTypes {
new
BorderDefinedTypeSpecifier
(
"round"
,
Widget
.
BUTTON_ROUND
,
new
SizeVariant
().
alterInsets
(
2
,
0
,
0
,
0
).
alterMinSize
(
28
,
28
),
-
3
,
-
3
,
-
3
,
-
3
),
new
BorderDefinedTypeSpecifier
(
"round"
,
Widget
.
BUTTON_ROUND
,
new
SizeVariant
().
alterInsets
(
2
,
0
,
0
,
0
).
alterMinSize
(
28
,
28
),
-
3
,
-
3
,
-
3
,
-
3
),
new
BorderDefinedTypeSpecifier
(
"texturedRound"
,
Widget
.
BUTTON_ROUND_INSET
,
new
SizeVariant
().
alterInsets
(
0
,
0
,
0
,
0
).
alterMinSize
(
26
,
26
),
-
2
,
-
2
,
0
,
0
),
new
BorderDefinedTypeSpecifier
(
"texturedRound"
,
Widget
.
BUTTON_ROUND_INSET
,
new
SizeVariant
().
alterInsets
(
0
,
0
,
0
,
0
).
alterMinSize
(
26
,
26
),
-
2
,
-
2
,
0
,
0
),
new
SegmentedBorderDefinedTypeSpecifier
(
"segmented-first"
,
Widget
.
BUTTON_SEGMENTED
,
SegmentPosition
.
FIRST
,
new
SizeVariant
().
alterMargins
(
6
,
16
,
6
,
10
).
alterInsets
(
5
,
3
,
5
,
0
).
alterMinSize
(
0
,
28
),
0
,
-
3
,
0
,
-
3
),
new
SegmentedBorderDefinedTypeSpecifier
(
"segmented-first"
,
Widget
.
BUTTON_SEGMENTED
,
SegmentPosition
.
FIRST
,
new
SizeVariant
().
alterMargins
(
6
,
16
,
6
,
10
).
alterInsets
(
2
,
3
,
2
,
0
).
alterMinSize
(
0
,
28
),
0
,
-
3
,
0
,
-
3
),
new
SegmentedBorderDefinedTypeSpecifier
(
"segmented-middle"
,
Widget
.
BUTTON_SEGMENTED
,
SegmentPosition
.
MIDDLE
,
new
SizeVariant
().
alterMargins
(
6
,
9
,
6
,
10
).
alterInsets
(
5
,
0
,
5
,
0
).
alterMinSize
(
0
,
28
),
0
,
-
3
,
0
,
-
3
),
new
SegmentedBorderDefinedTypeSpecifier
(
"segmented-middle"
,
Widget
.
BUTTON_SEGMENTED
,
SegmentPosition
.
MIDDLE
,
new
SizeVariant
().
alterMargins
(
6
,
9
,
6
,
10
).
alterInsets
(
2
,
0
,
2
,
0
).
alterMinSize
(
0
,
28
),
0
,
-
3
,
0
,
-
3
),
new
SegmentedBorderDefinedTypeSpecifier
(
"segmented-last"
,
Widget
.
BUTTON_SEGMENTED
,
SegmentPosition
.
LAST
,
new
SizeVariant
().
alterMargins
(
6
,
9
,
6
,
16
).
alterInsets
(
5
,
0
,
5
,
3
).
alterMinSize
(
0
,
28
),
0
,
-
3
,
0
,
-
3
),
new
SegmentedBorderDefinedTypeSpecifier
(
"segmented-last"
,
Widget
.
BUTTON_SEGMENTED
,
SegmentPosition
.
LAST
,
new
SizeVariant
().
alterMargins
(
6
,
9
,
6
,
16
).
alterInsets
(
2
,
0
,
2
,
3
).
alterMinSize
(
0
,
28
),
0
,
-
3
,
0
,
-
3
),
new
SegmentedBorderDefinedTypeSpecifier
(
"segmented-only"
,
Widget
.
BUTTON_SEGMENTED
,
SegmentPosition
.
ONLY
,
new
SizeVariant
().
alterMargins
(
6
,
16
,
6
,
16
).
alterInsets
(
5
,
3
,
5
,
3
).
alterMinSize
(
34
,
28
),
0
,
-
3
,
0
,
-
3
),
new
SegmentedBorderDefinedTypeSpecifier
(
"segmented-only"
,
Widget
.
BUTTON_SEGMENTED
,
SegmentPosition
.
ONLY
,
new
SizeVariant
().
alterMargins
(
6
,
16
,
6
,
16
).
alterInsets
(
2
,
3
,
2
,
3
).
alterMinSize
(
34
,
28
),
0
,
-
3
,
0
,
-
3
),
new
SegmentedBorderDefinedTypeSpecifier
(
"segmentedRoundRect-first"
,
Widget
.
BUTTON_SEGMENTED_INSET
,
SegmentPosition
.
FIRST
,
new
SizeVariant
().
alterMargins
(
6
,
12
,
6
,
8
).
alterInsets
(
5
,
2
,
5
,
0
).
alterMinSize
(
0
,
28
),
0
,
-
3
,
0
,
-
3
),
new
SegmentedBorderDefinedTypeSpecifier
(
"segmentedRoundRect-first"
,
Widget
.
BUTTON_SEGMENTED_INSET
,
SegmentPosition
.
FIRST
,
new
SizeVariant
().
alterMargins
(
6
,
12
,
6
,
8
).
alterInsets
(
2
,
2
,
2
,
0
).
alterMinSize
(
0
,
28
),
0
,
-
3
,
0
,
-
3
),
new
SegmentedBorderDefinedTypeSpecifier
(
"segmentedRoundRect-middle"
,
Widget
.
BUTTON_SEGMENTED_INSET
,
SegmentPosition
.
MIDDLE
,
new
SizeVariant
().
alterMargins
(
6
,
8
,
6
,
8
).
alterInsets
(
5
,
0
,
5
,
0
).
alterMinSize
(
0
,
28
),
0
,
-
3
,
0
,
-
3
),
new
SegmentedBorderDefinedTypeSpecifier
(
"segmentedRoundRect-middle"
,
Widget
.
BUTTON_SEGMENTED_INSET
,
SegmentPosition
.
MIDDLE
,
new
SizeVariant
().
alterMargins
(
6
,
8
,
6
,
8
).
alterInsets
(
2
,
0
,
2
,
0
).
alterMinSize
(
0
,
28
),
0
,
-
3
,
0
,
-
3
),
new
SegmentedBorderDefinedTypeSpecifier
(
"segmentedRoundRect-last"
,
Widget
.
BUTTON_SEGMENTED_INSET
,
SegmentPosition
.
LAST
,
new
SizeVariant
().
alterMargins
(
6
,
8
,
6
,
12
).
alterInsets
(
5
,
0
,
5
,
2
).
alterMinSize
(
0
,
28
),
0
,
-
3
,
0
,
-
3
),
new
SegmentedBorderDefinedTypeSpecifier
(
"segmentedRoundRect-last"
,
Widget
.
BUTTON_SEGMENTED_INSET
,
SegmentPosition
.
LAST
,
new
SizeVariant
().
alterMargins
(
6
,
8
,
6
,
12
).
alterInsets
(
2
,
0
,
2
,
2
).
alterMinSize
(
0
,
28
),
0
,
-
3
,
0
,
-
3
),
new
SegmentedBorderDefinedTypeSpecifier
(
"segmentedRoundRect-only"
,
Widget
.
BUTTON_SEGMENTED_INSET
,
SegmentPosition
.
ONLY
,
new
SizeVariant
().
alterMargins
(
6
,
12
,
6
,
12
).
alterInsets
(
5
,
2
,
5
,
2
).
alterMinSize
(
0
,
28
),
0
,
-
3
,
0
,
-
3
),
new
SegmentedBorderDefinedTypeSpecifier
(
"segmentedRoundRect-only"
,
Widget
.
BUTTON_SEGMENTED_INSET
,
SegmentPosition
.
ONLY
,
new
SizeVariant
().
alterMargins
(
6
,
12
,
6
,
12
).
alterInsets
(
2
,
2
,
2
,
2
).
alterMinSize
(
0
,
28
),
0
,
-
3
,
0
,
-
3
),
new
SegmentedBorderDefinedTypeSpecifier
(
"segmentedTexturedRounded-first"
,
Widget
.
BUTTON_SEGMENTED_SCURVE
,
SegmentPosition
.
FIRST
,
new
SizeVariant
().
alterMargins
(
6
,
12
,
6
,
8
).
alterInsets
(
5
,
2
,
5
,
0
).
alterMinSize
(
0
,
28
),
0
,
-
3
,
0
,
-
3
),
new
SegmentedBorderDefinedTypeSpecifier
(
"segmentedTexturedRounded-first"
,
Widget
.
BUTTON_SEGMENTED_SCURVE
,
SegmentPosition
.
FIRST
,
new
SizeVariant
().
alterMargins
(
6
,
12
,
6
,
8
).
alterInsets
(
2
,
2
,
2
,
0
).
alterMinSize
(
0
,
28
),
0
,
-
3
,
0
,
-
3
),
new
SegmentedBorderDefinedTypeSpecifier
(
"segmentedTexturedRounded-middle"
,
Widget
.
BUTTON_SEGMENTED_SCURVE
,
SegmentPosition
.
MIDDLE
,
new
SizeVariant
().
alterMargins
(
6
,
8
,
6
,
8
).
alterInsets
(
5
,
0
,
5
,
0
).
alterMinSize
(
0
,
28
),
0
,
-
3
,
0
,
-
3
),
new
SegmentedBorderDefinedTypeSpecifier
(
"segmentedTexturedRounded-middle"
,
Widget
.
BUTTON_SEGMENTED_SCURVE
,
SegmentPosition
.
MIDDLE
,
new
SizeVariant
().
alterMargins
(
6
,
8
,
6
,
8
).
alterInsets
(
2
,
0
,
2
,
0
).
alterMinSize
(
0
,
28
),
0
,
-
3
,
0
,
-
3
),
new
SegmentedBorderDefinedTypeSpecifier
(
"segmentedTexturedRounded-last"
,
Widget
.
BUTTON_SEGMENTED_SCURVE
,
SegmentPosition
.
LAST
,
new
SizeVariant
().
alterMargins
(
6
,
8
,
6
,
12
).
alterInsets
(
5
,
0
,
5
,
2
).
alterMinSize
(
0
,
28
),
0
,
-
3
,
0
,
-
3
),
new
SegmentedBorderDefinedTypeSpecifier
(
"segmentedTexturedRounded-last"
,
Widget
.
BUTTON_SEGMENTED_SCURVE
,
SegmentPosition
.
LAST
,
new
SizeVariant
().
alterMargins
(
6
,
8
,
6
,
12
).
alterInsets
(
2
,
0
,
2
,
2
).
alterMinSize
(
0
,
28
),
0
,
-
3
,
0
,
-
3
),
new
SegmentedBorderDefinedTypeSpecifier
(
"segmentedTexturedRounded-only"
,
Widget
.
BUTTON_SEGMENTED_SCURVE
,
SegmentPosition
.
ONLY
,
new
SizeVariant
().
alterMargins
(
6
,
12
,
6
,
12
).
alterInsets
(
5
,
2
,
5
,
2
).
alterMinSize
(
0
,
28
),
0
,
-
3
,
0
,
-
3
),
new
SegmentedBorderDefinedTypeSpecifier
(
"segmentedTexturedRounded-only"
,
Widget
.
BUTTON_SEGMENTED_SCURVE
,
SegmentPosition
.
ONLY
,
new
SizeVariant
().
alterMargins
(
6
,
12
,
6
,
12
).
alterInsets
(
2
,
2
,
2
,
2
).
alterMinSize
(
0
,
28
),
0
,
-
3
,
0
,
-
3
),
new
SegmentedBorderDefinedTypeSpecifier
(
"segmentedTextured-first"
,
Widget
.
BUTTON_SEGMENTED_TEXTURED
,
SegmentPosition
.
FIRST
,
new
SizeVariant
().
alterMargins
(
6
,
12
,
6
,
8
).
alterInsets
(
6
,
3
,
6
,
0
).
alterMinSize
(
0
,
28
),
0
,
-
3
,
0
,
-
3
),
new
SegmentedBorderDefinedTypeSpecifier
(
"segmentedTextured-first"
,
Widget
.
BUTTON_SEGMENTED_TEXTURED
,
SegmentPosition
.
FIRST
,
new
SizeVariant
().
alterMargins
(
6
,
12
,
6
,
8
).
alterInsets
(
2
,
3
,
2
,
0
).
alterMinSize
(
0
,
28
),
0
,
-
3
,
0
,
-
3
),
new
SegmentedBorderDefinedTypeSpecifier
(
"segmentedTextured-middle"
,
Widget
.
BUTTON_SEGMENTED_TEXTURED
,
SegmentPosition
.
MIDDLE
,
new
SizeVariant
().
alterMargins
(
6
,
8
,
6
,
8
).
alterInsets
(
6
,
0
,
6
,
0
).
alterMinSize
(
0
,
28
),
0
,
-
3
,
0
,
-
3
),
new
SegmentedBorderDefinedTypeSpecifier
(
"segmentedTextured-middle"
,
Widget
.
BUTTON_SEGMENTED_TEXTURED
,
SegmentPosition
.
MIDDLE
,
new
SizeVariant
().
alterMargins
(
6
,
8
,
6
,
8
).
alterInsets
(
2
,
0
,
2
,
0
).
alterMinSize
(
0
,
28
),
0
,
-
3
,
0
,
-
3
),
new
SegmentedBorderDefinedTypeSpecifier
(
"segmentedTextured-last"
,
Widget
.
BUTTON_SEGMENTED_TEXTURED
,
SegmentPosition
.
LAST
,
new
SizeVariant
().
alterMargins
(
6
,
8
,
6
,
12
).
alterInsets
(
6
,
0
,
6
,
3
).
alterMinSize
(
0
,
28
),
0
,
-
3
,
0
,
-
3
),
new
SegmentedBorderDefinedTypeSpecifier
(
"segmentedTextured-last"
,
Widget
.
BUTTON_SEGMENTED_TEXTURED
,
SegmentPosition
.
LAST
,
new
SizeVariant
().
alterMargins
(
6
,
8
,
6
,
12
).
alterInsets
(
2
,
0
,
2
,
3
).
alterMinSize
(
0
,
28
),
0
,
-
3
,
0
,
-
3
),
new
SegmentedBorderDefinedTypeSpecifier
(
"segmentedTextured-only"
,
Widget
.
BUTTON_SEGMENTED_TEXTURED
,
SegmentPosition
.
ONLY
,
new
SizeVariant
().
alterMargins
(
6
,
12
,
6
,
12
).
alterInsets
(
6
,
3
,
6
,
3
).
alterMinSize
(
0
,
28
),
0
,
-
3
,
0
,
-
3
),
new
SegmentedBorderDefinedTypeSpecifier
(
"segmentedTextured-only"
,
Widget
.
BUTTON_SEGMENTED_TEXTURED
,
SegmentPosition
.
ONLY
,
new
SizeVariant
().
alterMargins
(
6
,
12
,
6
,
12
).
alterInsets
(
2
,
3
,
2
,
3
).
alterMinSize
(
0
,
28
),
0
,
-
3
,
0
,
-
3
),
new
SegmentedBorderDefinedTypeSpecifier
(
"segmentedCapsule-first"
,
Widget
.
BUTTON_SEGMENTED_TOOLBAR
,
SegmentPosition
.
FIRST
,
new
SizeVariant
().
alterMargins
(
6
,
12
,
6
,
8
).
alterInsets
(
5
,
2
,
5
,
0
).
alterMinSize
(
0
,
28
),
0
,
0
,
0
,
0
),
new
SegmentedBorderDefinedTypeSpecifier
(
"segmentedCapsule-first"
,
Widget
.
BUTTON_SEGMENTED_TOOLBAR
,
SegmentPosition
.
FIRST
,
new
SizeVariant
().
alterMargins
(
6
,
12
,
6
,
8
).
alterInsets
(
2
,
2
,
2
,
0
).
alterMinSize
(
0
,
28
),
0
,
0
,
0
,
0
),
new
SegmentedBorderDefinedTypeSpecifier
(
"segmentedCapsule-middle"
,
Widget
.
BUTTON_SEGMENTED_TOOLBAR
,
SegmentPosition
.
MIDDLE
,
new
SizeVariant
().
alterMargins
(
6
,
8
,
6
,
8
).
alterInsets
(
5
,
0
,
5
,
0
).
alterMinSize
(
0
,
28
),
0
,
0
,
0
,
0
),
new
SegmentedBorderDefinedTypeSpecifier
(
"segmentedCapsule-middle"
,
Widget
.
BUTTON_SEGMENTED_TOOLBAR
,
SegmentPosition
.
MIDDLE
,
new
SizeVariant
().
alterMargins
(
6
,
8
,
6
,
8
).
alterInsets
(
2
,
0
,
2
,
0
).
alterMinSize
(
0
,
28
),
0
,
0
,
0
,
0
),
new
SegmentedBorderDefinedTypeSpecifier
(
"segmentedCapsule-last"
,
Widget
.
BUTTON_SEGMENTED_TOOLBAR
,
SegmentPosition
.
LAST
,
new
SizeVariant
().
alterMargins
(
6
,
8
,
6
,
12
).
alterInsets
(
5
,
0
,
5
,
2
).
alterMinSize
(
0
,
28
),
0
,
0
,
0
,
0
),
new
SegmentedBorderDefinedTypeSpecifier
(
"segmentedCapsule-last"
,
Widget
.
BUTTON_SEGMENTED_TOOLBAR
,
SegmentPosition
.
LAST
,
new
SizeVariant
().
alterMargins
(
6
,
8
,
6
,
12
).
alterInsets
(
2
,
0
,
2
,
2
).
alterMinSize
(
0
,
28
),
0
,
0
,
0
,
0
),
new
SegmentedBorderDefinedTypeSpecifier
(
"segmentedCapsule-only"
,
Widget
.
BUTTON_SEGMENTED_TOOLBAR
,
SegmentPosition
.
ONLY
,
new
SizeVariant
().
alterMargins
(
6
,
12
,
6
,
12
).
alterInsets
(
5
,
2
,
5
,
2
).
alterMinSize
(
34
,
28
),
0
,
0
,
0
,
0
),
new
SegmentedBorderDefinedTypeSpecifier
(
"segmentedCapsule-only"
,
Widget
.
BUTTON_SEGMENTED_TOOLBAR
,
SegmentPosition
.
ONLY
,
new
SizeVariant
().
alterMargins
(
6
,
12
,
6
,
12
).
alterInsets
(
2
,
2
,
2
,
2
).
alterMinSize
(
34
,
28
),
0
,
0
,
0
,
0
),
new
BorderDefinedTypeSpecifier
(
"segmentedGradient-first"
,
Widget
.
BUTTON_BEVEL_INSET
,
new
SizeVariant
(
18
,
18
).
alterMargins
(
4
,
5
,
4
,
5
).
replaceInsets
(
new
Insets
(-
2
,-
0
,-
2
,-
0
))),
new
BorderDefinedTypeSpecifier
(
"segmentedGradient-first"
,
Widget
.
BUTTON_BEVEL_INSET
,
new
SizeVariant
(
18
,
18
).
alterMargins
(
4
,
5
,
4
,
5
).
replaceInsets
(
new
Insets
(-
2
,-
0
,-
2
,-
0
))),
new
BorderDefinedTypeSpecifier
(
"segmentedGradient-middle"
,
Widget
.
BUTTON_BEVEL_INSET
,
new
SizeVariant
(
18
,
18
).
alterMargins
(
4
,
5
,
4
,
5
).
replaceInsets
(
new
Insets
(-
2
,-
1
,-
2
,-
0
))),
new
BorderDefinedTypeSpecifier
(
"segmentedGradient-middle"
,
Widget
.
BUTTON_BEVEL_INSET
,
new
SizeVariant
(
18
,
18
).
alterMargins
(
4
,
5
,
4
,
5
).
replaceInsets
(
new
Insets
(-
2
,-
1
,-
2
,-
0
))),
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录