Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
3e12d754
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
3e12d754
编写于
10月 16, 2008
作者:
P
prr
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
6751616: outline for underline in TextLayout with underline is off rasterized underline
Reviewed-by: dougfelt, igor
上级
8691e416
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
93 addition
and
2 deletion
+93
-2
src/share/classes/sun/font/Decoration.java
src/share/classes/sun/font/Decoration.java
+5
-2
test/java/awt/font/TextLayout/UnderlinePositionTest.java
test/java/awt/font/TextLayout/UnderlinePositionTest.java
+88
-0
未找到文件。
src/share/classes/sun/font/Decoration.java
浏览文件 @
3e12d754
...
...
@@ -379,6 +379,7 @@ public class Decoration {
// NOTE: The performace of the following code may
// be very poor.
float
ulThickness
=
cm
.
underlineThickness
;
float
ulOffset
=
cm
.
underlineOffset
;
Rectangle2D
lb
=
label
.
getLogicalBounds
();
float
x1
=
x
;
...
...
@@ -387,7 +388,8 @@ public class Decoration {
Area
area
=
null
;
if
(
stdUnderline
!=
null
)
{
Shape
ul
=
stdUnderline
.
getUnderlineShape
(
ulThickness
,
x1
,
x2
,
y
);
Shape
ul
=
stdUnderline
.
getUnderlineShape
(
ulThickness
,
x1
,
x2
,
y
+
ulOffset
);
area
=
new
Area
(
ul
);
}
...
...
@@ -406,7 +408,8 @@ public class Decoration {
}
if
(
imUnderline
!=
null
)
{
Shape
ul
=
imUnderline
.
getUnderlineShape
(
ulThickness
,
x1
,
x2
,
y
);
Shape
ul
=
imUnderline
.
getUnderlineShape
(
ulThickness
,
x1
,
x2
,
y
+
ulOffset
);
Area
ulArea
=
new
Area
(
ul
);
if
(
area
==
null
)
{
area
=
ulArea
;
...
...
test/java/awt/font/TextLayout/UnderlinePositionTest.java
0 → 100644
浏览文件 @
3e12d754
/*
* Copyright 2008 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
* 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
/* @test
* @summary verify outline and stroking of underline match.
* @bug 6751616
*/
import
java.awt.*
;
import
java.awt.font.*
;
import
java.awt.geom.*
;
import
java.awt.image.*
;
import
java.util.*
;
public
class
UnderlinePositionTest
{
public
static
void
main
(
String
[]
args
)
{
BufferedImage
bi
=
new
BufferedImage
(
600
,
150
,
BufferedImage
.
TYPE_INT_RGB
);
Graphics2D
g2d
=
bi
.
createGraphics
();
g2d
.
setColor
(
Color
.
white
);
g2d
.
fillRect
(
0
,
0
,
600
,
150
);
float
x
=
10
;
float
y
=
90
;
Map
map
=
new
HashMap
();
map
.
put
(
TextAttribute
.
UNDERLINE
,
TextAttribute
.
UNDERLINE_ON
);
map
.
put
(
TextAttribute
.
SIZE
,
new
Float
(
80
));
FontRenderContext
frc
=
g2d
.
getFontRenderContext
();
// Use all spaces for the text so we know we are dealing
// only with pixels from the underline.
String
text
=
" "
;
TextLayout
tl
=
new
TextLayout
(
text
,
map
,
frc
);
Shape
outline
=
tl
.
getOutline
(
null
);
Rectangle2D
bounds
=
outline
.
getBounds
();
g2d
.
translate
(
x
,
y
);
g2d
.
setColor
(
Color
.
RED
);
tl
.
draw
(
g2d
,
0
,
0
);
/* By getting the outline, then its bounds, then filling
* according to the same pixelisation rules, this ought to
* match the position of the original underline. If any
* red pixels are left, then the test will fail.
*/
g2d
.
setColor
(
Color
.
BLUE
);
g2d
.
fill
(
bounds
);
g2d
.
dispose
();
checkBI
(
bi
,
Color
.
RED
);
}
static
void
checkBI
(
BufferedImage
bi
,
Color
badColor
)
{
int
badrgb
=
badColor
.
getRGB
();
int
w
=
bi
.
getWidth
(
null
);
int
h
=
bi
.
getHeight
(
null
);
for
(
int
x
=
0
;
x
<
w
;
x
++)
{
for
(
int
y
=
0
;
y
<
h
;
y
++)
{
int
col
=
bi
.
getRGB
(
x
,
y
);
if
(
col
==
badrgb
)
{
throw
new
RuntimeException
(
"Got "
+
col
);
}
}
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录