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

Unified Diff: sky/sdk/lib/framework/fn2.dart

Issue 1147143005: Make Drawer in components2 work (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Rebase Created 5 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/sdk/lib/framework/components2/material.dart ('k') | sky/sdk/lib/framework/rendering/box.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/sdk/lib/framework/fn2.dart
diff --git a/sky/sdk/lib/framework/fn2.dart b/sky/sdk/lib/framework/fn2.dart
index 10b93c563bbfd0351f6aa6f04a38e9e0da3812a2..f705a7d5506c2119c42e02aa40612991247dd09d 100644
--- a/sky/sdk/lib/framework/fn2.dart
+++ b/sky/sdk/lib/framework/fn2.dart
@@ -16,6 +16,7 @@ import 'rendering/box.dart';
import 'rendering/flex.dart';
import 'rendering/node.dart';
import 'rendering/paragraph.dart';
+import 'rendering/stack.dart';
// final sky.Tracing _tracing = sky.window.tracing;
@@ -390,7 +391,7 @@ class SizedBox extends OneChildRenderNodeWrapper {
RenderSizedBox createNode() => new RenderSizedBox(desiredSize: desiredSize);
- void syncRenderNode(DecoratedBox old) {
+ void syncRenderNode(SizedBox old) {
super.syncRenderNode(old);
root.desiredSize = desiredSize;
}
@@ -591,6 +592,14 @@ class BlockContainer extends OneChildListRenderNodeWrapper {
: super(key: key, children: children);
}
+class StackContainer extends OneChildListRenderNodeWrapper {
+ RenderStack root;
+ RenderStack createNode() => new RenderStack();
+
+ StackContainer({ Object key, List<UINode> children })
+ : super(key: key, children: children);
+}
+
class Paragraph extends RenderNodeWrapper {
RenderParagraph root;
RenderParagraph createNode() => new RenderParagraph(text: text);
@@ -885,9 +894,6 @@ class Container extends Component {
UINode build() {
UINode current = child;
- if (transform != null)
- current = new Transform(transform: transform, child: current);
-
if (padding != null)
current = new Padding(padding: padding, child: current);
@@ -900,6 +906,9 @@ class Container extends Component {
if (margin != null)
current = new Padding(padding: margin, child: current);
+ if (transform != null)
+ current = new Transform(transform: transform, child: current);
+
return current;
}
}
« no previous file with comments | « sky/sdk/lib/framework/components2/material.dart ('k') | sky/sdk/lib/framework/rendering/box.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698