firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for line-height in TextStyle.

Browse Source 
Also, some minor cleanup in TextStyle to make it more readable.

R=eseidel@chromium.org

Review URL: https://codereview.chromium.org/1203253002.
This commit is contained in:
Hixie
2015-06-24 13:25:17 -07:00
parent cdca813cc1
commit 3e35fb4548
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
engine/src/flutter/tests/examples/styled_text-expected.txt
View File

@@ -13,9 +13,9 @@ PAINT FOR FRAME #2 ----------------------------------------------
2 | | | drawRRect(Instance of 'RRect', Paint(color:Color(0xfffafafa)))
2 | | | paintChild RenderFlex at Point(8.0, 0.0)
2 | | | | TestRenderCanvas() constructor: 800.0 x 600.0
2 | | | | paintChild RenderParagraph at Point(0.0, 117.5)
2 | | | | paintChild RenderParagraph at Point(0.0, 95.0)
2 | | | | | TestRenderCanvas() constructor: 800.0 x 600.0
2 | | | | paintChild RenderPadding at Point(0.0, 149.5)
2 | | | | paintChild RenderPadding at Point(0.0, 145.0)
2 | | | | | TestRenderCanvas() constructor: 800.0 x 600.0
2 | | | | | paintChild RenderConstrainedBox at Point(64.0, 10.0)
2 | | | | | | TestRenderCanvas() constructor: 800.0 x 600.0
@@ -23,9 +23,9 @@ PAINT FOR FRAME #2 ----------------------------------------------
2 | | | | | | drawPath(Instance of 'Path', Paint(color:Color(0xff000000)))
2 | | | | | | drawPath(Instance of 'Path', Paint(color:Color(0x18000000)))
2 | | | | | | drawPath(Instance of 'Path', Paint(color:Color(0xff000000)))
2 | | | | paintChild RenderParagraph at Point(0.0, 169.5)
2 | | | | paintChild RenderParagraph at Point(0.0, 165.0)
2 | | | | | TestRenderCanvas() constructor: 800.0 x 600.0
2 | | | | paintChild RenderPadding at Point(0.0, 185.5)
2 | | | | paintChild RenderPadding at Point(0.0, 181.0)
2 | | | | | TestRenderCanvas() constructor: 800.0 x 600.0
2 | | | | | paintChild RenderConstrainedBox at Point(64.0, 10.0)
2 | | | | | | TestRenderCanvas() constructor: 800.0 x 600.0
@@ -33,9 +33,9 @@ PAINT FOR FRAME #2 ----------------------------------------------
2 | | | | | | drawPath(Instance of 'Path', Paint(color:Color(0xff000000)))
2 | | | | | | drawPath(Instance of 'Path', Paint(color:Color(0x18000000)))
2 | | | | | | drawPath(Instance of 'Path', Paint(color:Color(0xff000000)))
2 | | | | paintChild RenderParagraph at Point(0.0, 205.5)
2 | | | | paintChild RenderParagraph at Point(0.0, 201.0)
2 | | | | | TestRenderCanvas() constructor: 800.0 x 600.0
2 | | | | paintChild RenderPadding at Point(0.0, 221.5)
2 | | | | paintChild RenderPadding at Point(0.0, 226.0)
2 | | | | | TestRenderCanvas() constructor: 800.0 x 600.0
2 | | | | | paintChild RenderConstrainedBox at Point(64.0, 10.0)
2 | | | | | | TestRenderCanvas() constructor: 800.0 x 600.0
@@ -43,9 +43,9 @@ PAINT FOR FRAME #2 ----------------------------------------------
2 | | | | | | drawPath(Instance of 'Path', Paint(color:Color(0xff000000)))
2 | | | | | | drawPath(Instance of 'Path', Paint(color:Color(0x18000000)))
2 | | | | | | drawPath(Instance of 'Path', Paint(color:Color(0xff000000)))
2 | | | | paintChild RenderParagraph at Point(0.0, 241.5)
2 | | | | paintChild RenderParagraph at Point(0.0, 246.0)
2 | | | | | TestRenderCanvas() constructor: 800.0 x 600.0
2 | | | | paintChild RenderPadding at Point(0.0, 257.5)
2 | | | | paintChild RenderPadding at Point(0.0, 262.0)
2 | | | | | TestRenderCanvas() constructor: 800.0 x 600.0
2 | | | | | paintChild RenderConstrainedBox at Point(64.0, 10.0)
2 | | | | | | TestRenderCanvas() constructor: 800.0 x 600.0
@@ -53,9 +53,9 @@ PAINT FOR FRAME #2 ----------------------------------------------
2 | | | | | | drawPath(Instance of 'Path', Paint(color:Color(0xff000000)))
2 | | | | | | drawPath(Instance of 'Path', Paint(color:Color(0x18000000)))
2 | | | | | | drawPath(Instance of 'Path', Paint(color:Color(0xff000000)))
2 | | | | paintChild RenderParagraph at Point(0.0, 277.5)
2 | | | | paintChild RenderParagraph at Point(0.0, 282.0)
2 | | | | | TestRenderCanvas() constructor: 800.0 x 600.0
2 | | | | paintChild RenderPadding at Point(0.0, 293.5)
2 | | | | paintChild RenderPadding at Point(0.0, 307.0)
2 | | | | | TestRenderCanvas() constructor: 800.0 x 600.0
2 | | | | | paintChild RenderConstrainedBox at Point(64.0, 10.0)
2 | | | | | | TestRenderCanvas() constructor: 800.0 x 600.0
@@ -63,9 +63,9 @@ PAINT FOR FRAME #2 ----------------------------------------------
2 | | | | | | drawPath(Instance of 'Path', Paint(color:Color(0xff000000)))
2 | | | | | | drawPath(Instance of 'Path', Paint(color:Color(0x18000000)))
2 | | | | | | drawPath(Instance of 'Path', Paint(color:Color(0xff000000)))
2 | | | | paintChild RenderParagraph at Point(0.0, 313.5)
2 | | | | paintChild RenderParagraph at Point(0.0, 327.0)
2 | | | | | TestRenderCanvas() constructor: 800.0 x 600.0
2 | | | | paintChild RenderPadding at Point(0.0, 329.5)
2 | | | | paintChild RenderPadding at Point(0.0, 343.0)
2 | | | | | TestRenderCanvas() constructor: 800.0 x 600.0
2 | | | | | paintChild RenderConstrainedBox at Point(64.0, 10.0)
2 | | | | | | TestRenderCanvas() constructor: 800.0 x 600.0
@@ -73,9 +73,9 @@ PAINT FOR FRAME #2 ----------------------------------------------
2 | | | | | | drawPath(Instance of 'Path', Paint(color:Color(0xff000000)))
2 | | | | | | drawPath(Instance of 'Path', Paint(color:Color(0x18000000)))
2 | | | | | | drawPath(Instance of 'Path', Paint(color:Color(0xff000000)))
2 | | | | paintChild RenderParagraph at Point(0.0, 349.5)
2 | | | | paintChild RenderParagraph at Point(0.0, 363.0)
2 | | | | | TestRenderCanvas() constructor: 800.0 x 600.0
2 | | | | paintChild RenderPadding at Point(0.0, 365.5)
2 | | | | paintChild RenderPadding at Point(0.0, 388.0)
2 | | | | | TestRenderCanvas() constructor: 800.0 x 600.0
2 | | | | | paintChild RenderConstrainedBox at Point(64.0, 10.0)
2 | | | | | | TestRenderCanvas() constructor: 800.0 x 600.0
@@ -83,7 +83,7 @@ PAINT FOR FRAME #2 ----------------------------------------------
2 | | | | | | drawPath(Instance of 'Path', Paint(color:Color(0xff000000)))
2 | | | | | | drawPath(Instance of 'Path', Paint(color:Color(0x18000000)))
2 | | | | | | drawPath(Instance of 'Path', Paint(color:Color(0xff000000)))
2 | | | | paintChild RenderParagraph at Point(0.0, 385.5)
2 | | | | paintChild RenderParagraph at Point(0.0, 408.0)
2 | | | | | TestRenderCanvas() constructor: 800.0 x 600.0
2 | | paintChild RenderDecoratedBox at Point(0.0, 0.0)
2 | | | TestRenderCanvas() constructor: 800.0 x 600.0