Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
141d540e
Commit
141d540e
authored
Jan 19, 2016
by
Devon Carew
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1300 from devoncarew/null_aware_issue
fix two null-aware-operator issues
parents
0bf6170c
0e99d2fd
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
text_style.dart
packages/flutter/lib/src/painting/text_style.dart
+2
-2
No files found.
packages/flutter/lib/src/painting/text_style.dart
View file @
141d540e
...
...
@@ -138,7 +138,7 @@ class TextStyle {
fontFamily:
t
<
0.5
?
begin
.
fontFamily
:
end
.
fontFamily
,
fontSize:
ui
.
lerpDouble
(
begin
.
fontSize
??
end
.
fontSize
,
end
.
fontSize
??
begin
.
fontSize
,
t
),
// TODO(ianh): Replace next line with "fontWeight: FontWeight.lerp(begin.fontWeight, end.fontWeight, t)," once engine is revved
fontWeight:
FontWeight
.
values
[
ui
.
lerpDouble
(
begin
?.
fontWeight
.
index
??
FontWeight
.
normal
.
index
,
end
?.
fontWeight
.
index
??
FontWeight
.
normal
.
index
,
t
.
clamp
(
0.0
,
1.0
)).
round
()],
fontWeight:
FontWeight
.
values
[
ui
.
lerpDouble
(
begin
?.
fontWeight
?.
index
??
FontWeight
.
normal
.
index
,
end
?.
fontWeight
?
.
index
??
FontWeight
.
normal
.
index
,
t
.
clamp
(
0.0
,
1.0
)).
round
()],
fontStyle:
t
<
0.5
?
begin
.
fontStyle
:
end
.
fontStyle
,
letterSpacing:
ui
.
lerpDouble
(
begin
.
letterSpacing
??
end
.
letterSpacing
,
end
.
letterSpacing
??
begin
.
letterSpacing
,
t
),
wordSpacing:
ui
.
lerpDouble
(
begin
.
wordSpacing
??
end
.
wordSpacing
,
end
.
wordSpacing
??
begin
.
wordSpacing
,
t
),
...
...
@@ -150,7 +150,7 @@ class TextStyle {
decorationStyle:
t
<
0.5
?
begin
.
decorationStyle
:
end
.
decorationStyle
);
}
ui
.
TextStyle
get
textStyle
{
return
new
ui
.
TextStyle
(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment