| OLD | NEW |
| 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 'object.dart'; | 7 import 'object.dart'; |
| 8 | 8 |
| 9 class RenderInline extends RenderObject { | 9 class RenderInline extends RenderObject { |
| 10 String data; | 10 String data; |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 Size(_layoutRoot.rootElement.width, _layout
Root.rootElement.height)); | 55 // rootElement.width always expands to fill, use maxContentWidth instead. |
| 56 var root = _layoutRoot.rootElement; |
| 57 size = constraints.constrain(new Size(root.maxContentWidth, root.height)); |
| 56 } | 58 } |
| 57 | 59 |
| 58 void paint(RenderObjectDisplayList canvas) { | 60 void paint(RenderObjectDisplayList canvas) { |
| 59 // _layoutRoot.rootElement.style['color'] = 'rgba(' + ...color... + ')'; | 61 // _layoutRoot.rootElement.style['color'] = 'rgba(' + ...color... + ')'; |
| 60 _layoutRoot.paint(canvas); | 62 _layoutRoot.paint(canvas); |
| 61 } | 63 } |
| 62 | 64 |
| 63 // we should probably expose a way to do precise (inter-glpyh) hit testing | 65 // we should probably expose a way to do precise (inter-glpyh) hit testing |
| 64 | 66 |
| 65 String debugDescribeSettings(String prefix) => '${super.debugDescribeSettings(
prefix)}${prefix}color: ${color}\n${prefix}text: ${text}\n'; | 67 String debugDescribeSettings(String prefix) => '${super.debugDescribeSettings(
prefix)}${prefix}color: ${color}\n${prefix}text: ${text}\n'; |
| 66 } | 68 } |
| OLD | NEW |