mirror of
https://github.com/flutter/flutter.git
synced 2026-02-20 02:29:02 +08:00
[web] Don't set both color and foreground at the same time (flutter/engine#24828)
This commit is contained in:
parent
ee8a5e9bd0
commit
a0f418b769
@ -403,7 +403,7 @@ abstract class StyleNode {
|
||||
return style;
|
||||
}
|
||||
|
||||
ui.Color get _color;
|
||||
ui.Color? get _color;
|
||||
ui.TextDecoration? get _decoration;
|
||||
ui.Color? get _decorationColor;
|
||||
ui.TextDecorationStyle? get _decorationStyle;
|
||||
@ -439,7 +439,7 @@ class ChildStyleNode extends StyleNode {
|
||||
// property isn't defined, go to the parent node.
|
||||
|
||||
@override
|
||||
ui.Color get _color => style._color ?? parent._color;
|
||||
ui.Color? get _color => style._color ?? (_foreground == null ? parent._color : null);
|
||||
|
||||
@override
|
||||
ui.TextDecoration? get _decoration => style._decoration ?? parent._decoration;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user