Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(460)

Side by Side Diff: sky/sdk/lib/framework/rendering/paragraph.dart

Issue 1162023004: Update BoxDecoration and RenderParagraph to use sky.Color instead of int. (Closed) Base URL: git@github.com:/domokit/mojo.git@master
Patch Set: test expectations Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « sky/sdk/lib/framework/rendering/box.dart ('k') | sky/tests/raw/box_layout.dart » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 import 'dart:sky' as sky; 5 import 'dart:sky' as sky;
6 import 'box.dart'; 6 import 'box.dart';
7 import 'node.dart'; 7 import 'node.dart';
8 8
9 class RenderInline extends RenderNode { 9 class RenderInline extends RenderNode {
10 String data; 10 String data;
11 11
12 RenderInline(this.data); 12 RenderInline(this.data);
13 } 13 }
14 14
15 class RenderParagraph extends RenderBox { 15 class RenderParagraph extends RenderBox {
16 16
17 RenderParagraph({ 17 RenderParagraph({
18 String text, 18 String text,
19 int color 19 sky.Color color
20 }) : _color = color { 20 }) : _color = color {
21 _layoutRoot.rootElement = _document.createElement('p'); 21 _layoutRoot.rootElement = _document.createElement('p');
22 this.text = text; 22 this.text = text;
23 } 23 }
24 24
25 final sky.Document _document = new sky.Document(); 25 final sky.Document _document = new sky.Document();
26 final sky.LayoutRoot _layoutRoot = new sky.LayoutRoot(); 26 final sky.LayoutRoot _layoutRoot = new sky.LayoutRoot();
27 27
28 String get text => (_layoutRoot.rootElement.firstChild as sky.Text).data; 28 String get text => (_layoutRoot.rootElement.firstChild as sky.Text).data;
29 void set text (String value) { 29 void set text (String value) {
30 _layoutRoot.rootElement.setChild(_document.createText(value)); 30 _layoutRoot.rootElement.setChild(_document.createText(value));
31 markNeedsLayout(); 31 markNeedsLayout();
32 } 32 }
33 33
34 int _color = 0xFF000000; 34 sky.Color _color = const sky.Color(0xFF000000);
35 int get color => _color; 35 sky.Color get color => _color;
36 void set color (int value) { 36 void set color (sky.Color value) {
37 if (_color != value) { 37 if (_color != value) {
38 _color = value; 38 _color = value;
39 markNeedsPaint(); 39 markNeedsPaint();
40 } 40 }
41 } 41 }
42 42
43 sky.Size getIntrinsicDimensions(BoxConstraints constraints) { 43 sky.Size getIntrinsicDimensions(BoxConstraints constraints) {
44 assert(false); 44 assert(false);
45 return null; 45 return null;
46 // we don't currently support this for RenderParagraph 46 // we don't currently support this for RenderParagraph
47 } 47 }
48 48
49 void performLayout() { 49 void performLayout() {
50 _layoutRoot.maxWidth = constraints.maxWidth; 50 _layoutRoot.maxWidth = constraints.maxWidth;
51 _layoutRoot.minWidth = constraints.minWidth; 51 _layoutRoot.minWidth = constraints.minWidth;
52 _layoutRoot.minHeight = constraints.minHeight; 52 _layoutRoot.minHeight = constraints.minHeight;
53 _layoutRoot.maxHeight = constraints.maxHeight; 53 _layoutRoot.maxHeight = constraints.maxHeight;
54 _layoutRoot.layout(); 54 _layoutRoot.layout();
55 size = constraints.constrain(new sky.Size(_layoutRoot.rootElement.width, _la youtRoot.rootElement.height)); 55 size = constraints.constrain(new sky.Size(_layoutRoot.rootElement.width, _la youtRoot.rootElement.height));
56 } 56 }
57 57
58 void paint(RenderNodeDisplayList canvas) { 58 void paint(RenderNodeDisplayList canvas) {
59 // _layoutRoot.rootElement.style['color'] = 'rgba(' + ...color... + ')'; 59 // _layoutRoot.rootElement.style['color'] = 'rgba(' + ...color... + ')';
60 _layoutRoot.paint(canvas); 60 _layoutRoot.paint(canvas);
61 } 61 }
62 62
63 // we should probably expose a way to do precise (inter-glpyh) hit testing 63 // we should probably expose a way to do precise (inter-glpyh) hit testing
64 } 64 }
OLDNEW
« no previous file with comments | « sky/sdk/lib/framework/rendering/box.dart ('k') | sky/tests/raw/box_layout.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698