Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_43355755
engine
提交
38f6665b
E
engine
项目概览
weixin_43355755
/
engine
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
E
engine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
38f6665b
编写于
10月 29, 2020
作者:
H
Harry Terkelsen
提交者:
GitHub
10月 29, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Set strut font to Roboto if the given font hasn't been registered (#22129)
上级
9ccf9f12
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
10 addition
and
16 deletion
+10
-16
lib/web_ui/lib/src/engine/canvaskit/text.dart
lib/web_ui/lib/src/engine/canvaskit/text.dart
+10
-16
未找到文件。
lib/web_ui/lib/src/engine/canvaskit/text.dart
浏览文件 @
38f6665b
...
@@ -75,7 +75,11 @@ class CkParagraphStyle implements ui.ParagraphStyle {
...
@@ -75,7 +75,11 @@ class CkParagraphStyle implements ui.ParagraphStyle {
EngineStrutStyle
style
=
value
as
EngineStrutStyle
;
EngineStrutStyle
style
=
value
as
EngineStrutStyle
;
final
SkStrutStyleProperties
skStrutStyle
=
SkStrutStyleProperties
();
final
SkStrutStyleProperties
skStrutStyle
=
SkStrutStyleProperties
();
if
(
style
.
_fontFamily
!=
null
)
{
if
(
style
.
_fontFamily
!=
null
)
{
final
List
<
String
>
fontFamilies
=
<
String
>[
style
.
_fontFamily
!];
String
fontFamily
=
style
.
_fontFamily
!;
if
(!
skiaFontCollection
.
registeredFamilies
.
contains
(
fontFamily
))
{
fontFamily
=
'Roboto'
;
}
final
List
<
String
>
fontFamilies
=
<
String
>[
fontFamily
];
if
(
style
.
_fontFamilyFallback
!=
null
)
{
if
(
style
.
_fontFamilyFallback
!=
null
)
{
fontFamilies
.
addAll
(
style
.
_fontFamilyFallback
!);
fontFamilies
.
addAll
(
style
.
_fontFamilyFallback
!);
}
}
...
@@ -531,10 +535,10 @@ class CkParagraph extends ManagedSkiaObject<SkParagraph>
...
@@ -531,10 +535,10 @@ class CkParagraph extends ManagedSkiaObject<SkParagraph>
for
(
int
i
=
0
;
i
<
skRects
.
length
;
i
++)
{
for
(
int
i
=
0
;
i
<
skRects
.
length
;
i
++)
{
final
List
<
double
>
rect
=
skRects
[
i
];
final
List
<
double
>
rect
=
skRects
[
i
];
result
.
add
(
ui
.
TextBox
.
fromLTRBD
(
result
.
add
(
ui
.
TextBox
.
fromLTRBD
(
rect
[
0
],
rect
[
0
],
rect
[
1
],
rect
[
1
],
rect
[
2
],
rect
[
2
],
rect
[
3
],
rect
[
3
],
_paragraphStyle
.
_textDirection
!,
_paragraphStyle
.
_textDirection
!,
));
));
}
}
...
@@ -563,20 +567,10 @@ class CkParagraph extends ManagedSkiaObject<SkParagraph>
...
@@ -563,20 +567,10 @@ class CkParagraph extends ManagedSkiaObject<SkParagraph>
assert
(
constraints
.
width
!=
null
);
// ignore: unnecessary_null_comparison
assert
(
constraints
.
width
!=
null
);
// ignore: unnecessary_null_comparison
_lastLayoutConstraints
=
constraints
;
_lastLayoutConstraints
=
constraints
;
// Infinite width breaks layout, just use a very large number instead.
// TODO(het): Remove this once https://bugs.chromium.org/p/skia/issues/detail?id=9874
// is fixed.
double
width
;
const
double
largeFiniteWidth
=
1000000
;
if
(
constraints
.
width
.
isInfinite
)
{
width
=
largeFiniteWidth
;
}
else
{
width
=
constraints
.
width
;
}
// TODO(het): CanvasKit throws an exception when laid out with
// TODO(het): CanvasKit throws an exception when laid out with
// a font that wasn't registered.
// a font that wasn't registered.
try
{
try
{
skiaObject
.
layout
(
width
);
skiaObject
.
layout
(
constraints
.
width
);
}
catch
(
e
)
{
}
catch
(
e
)
{
html
.
window
.
console
.
warn
(
'CanvasKit threw an exception while laying '
html
.
window
.
console
.
warn
(
'CanvasKit threw an exception while laying '
'out the paragraph. The font was "
${_paragraphStyle._fontFamily}
". '
'out the paragraph. The font was "
${_paragraphStyle._fontFamily}
". '
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录