Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
sxychenjing
engine
提交
14c8c244
E
engine
项目概览
sxychenjing
/
engine
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
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,发现更多精彩内容 >>
未验证
提交
14c8c244
编写于
12月 10, 2020
作者:
M
Mouad Debbar
提交者:
GitHub
12月 10, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[web] Fix regression in foreground style (#22999)
上级
6ebf5c38
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
18 addition
and
4 deletion
+18
-4
lib/web_ui/lib/src/engine/text/paragraph.dart
lib/web_ui/lib/src/engine/text/paragraph.dart
+6
-2
lib/web_ui/test/paragraph_builder_test.dart
lib/web_ui/test/paragraph_builder_test.dart
+12
-2
未找到文件。
lib/web_ui/lib/src/engine/text/paragraph.dart
浏览文件 @
14c8c244
...
...
@@ -1328,7 +1328,7 @@ class DomParagraphBuilder implements ui.ParagraphBuilder {
/// paragraph. Plain text is more efficient to lay out and measure than rich
/// text.
EngineParagraph
?
_tryBuildPlainText
()
{
ui
.
Color
color
=
_defaultTextC
olor
;
ui
.
Color
?
c
olor
;
ui
.
TextDecoration
?
decoration
;
ui
.
Color
?
decorationColor
;
ui
.
TextDecorationStyle
?
decorationStyle
;
...
...
@@ -1416,6 +1416,10 @@ class DomParagraphBuilder implements ui.ParagraphBuilder {
i
++;
}
if
(
color
==
null
&&
foreground
==
null
)
{
color
=
_defaultTextColor
;
}
final
EngineTextStyle
cumulativeStyle
=
EngineTextStyle
(
color:
color
,
decoration:
decoration
,
...
...
@@ -1443,7 +1447,7 @@ class DomParagraphBuilder implements ui.ParagraphBuilder {
paint
=
foreground
;
}
else
{
paint
=
ui
.
Paint
();
paint
.
color
=
color
;
paint
.
color
=
color
!
;
}
if
(
i
>=
_ops
.
length
)
{
...
...
lib/web_ui/test/paragraph_builder_test.dart
浏览文件 @
14c8c244
...
...
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// @dart = 2.
6
// @dart = 2.
12
import
'package:test/bootstrap/browser.dart'
;
import
'package:test/test.dart'
;
import
'package:ui/src/engine.dart'
;
...
...
@@ -28,10 +28,20 @@ void testMain() {
expect
(
paragraph
.
height
,
isNonZero
);
});
test
(
'
P
ushStyle should not segfault after build()'
,
()
{
test
(
'
p
ushStyle should not segfault after build()'
,
()
{
final
ParagraphBuilder
paragraphBuilder
=
ParagraphBuilder
(
ParagraphStyle
());
paragraphBuilder
.
build
();
paragraphBuilder
.
pushStyle
(
TextStyle
());
});
test
(
'the presence of foreground style should not throw'
,
()
{
final
ParagraphBuilder
builder
=
ParagraphBuilder
(
ParagraphStyle
());
builder
.
pushStyle
(
TextStyle
(
foreground:
Paint
()..
color
=
const
Color
(
0xFFABCDEF
),
));
builder
.
addText
(
'hi'
);
expect
(()
=>
builder
.
build
(),
returnsNormally
);
});
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录