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

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

Issue 1160843005: Add hello_fn2.dart and make Text("Hello fn2") actually render something. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Fixored 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/examples/fn2/hello_fn2.dart ('k') | sky/sdk/lib/framework/layout2.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 962c9efd6ac899427f752314e84b801690b8c110..b1e95bdb3147b709556235cd0c3bbea0739fc9d6 100644
--- a/sky/sdk/lib/framework/fn2.dart
+++ b/sky/sdk/lib/framework/fn2.dart
@@ -543,10 +543,11 @@ class Container extends OneChildListRenderNodeWrapper {
);
}
-class Paragraph extends OneChildListRenderNodeWrapper {
+class Paragraph extends RenderNodeWrapper {
- RenderCSSParagraph root;
- RenderCSSParagraph createNode() => new RenderCSSParagraph(this);
+ RenderParagraph root;
+ RenderParagraph createNode() => new RenderParagraph(text);
+ String text;
static final Paragraph _emptyContainer = new Paragraph();
@@ -554,11 +555,15 @@ class Paragraph extends OneChildListRenderNodeWrapper {
Paragraph({
Object key,
- List<UINode> children
+ this.text
}) : super(
- key: key,
- children: children
+ key: key
);
+
+ void syncRenderNode(UINode old) {
+ super.syncRenderNode(old);
+ root.text = text;
+ }
}
class FlexContainer extends OneChildListRenderNodeWrapper {
@@ -646,29 +651,6 @@ abstract class OneChildRenderNodeWrapper extends RenderNodeWrapper {
}
}
-class TextFragment extends RenderNodeWrapper {
-
- RenderCSSInline root;
- RenderCSSInline createNode() => new RenderCSSInline(this, this.data);
-
- static final TextFragment _emptyText = new TextFragment('');
-
- RenderNodeWrapper get emptyNode => _emptyText;
-
- final String data;
-
- TextFragment(this.data, {
- Object key
- }) : super(
- key: key
- );
-
- void syncRenderNode(UINode old) {
- super.syncRenderNode(old);
- root.data = data;
- }
-}
-
class Image extends RenderNodeWrapper {
RenderCSSImage root;
@@ -936,7 +918,7 @@ class Text extends Component {
Text(this.data) : super(key: '*text*');
final String data;
bool get interchangeable => true;
- UINode build() => new Paragraph(children: [new TextFragment(data)]);
+ UINode build() => new Paragraph(text: data);
}
« no previous file with comments | « sky/examples/fn2/hello_fn2.dart ('k') | sky/sdk/lib/framework/layout2.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698