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

Side by Side Diff: sky/sdk/lib/framework/components2/scaffold.dart

Issue 1174143002: Fix inconsistency about how to spell "statusBar" which was causing warnings. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: 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 | « no previous file | no next file » | 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 '../fn2.dart'; 5 import '../fn2.dart';
6 import '../rendering/box.dart'; 6 import '../rendering/box.dart';
7 import '../rendering/object.dart'; 7 import '../rendering/object.dart';
8 import '../theme2/view_configuration.dart'; 8 import '../theme2/view_configuration.dart';
9 9
10 enum ScaffoldSlots { 10 enum ScaffoldSlots {
11 toolbar, 11 toolbar,
12 body, 12 body,
13 statusBar, 13 statusBar,
14 drawer, 14 drawer,
15 floatingActionButton 15 floatingActionButton
16 } 16 }
17 17
18 class RenderScaffold extends RenderBox { 18 class RenderScaffold extends RenderBox {
19 19
20 RenderScaffold({ 20 RenderScaffold({
21 RenderBox toolbar, 21 RenderBox toolbar,
22 RenderBox body, 22 RenderBox body,
23 RenderBox statusbar, 23 RenderBox statusBar,
24 RenderBox drawer, 24 RenderBox drawer,
25 RenderBox floatingActionButton 25 RenderBox floatingActionButton
26 }) { 26 }) {
27 this[ScaffoldSlots.toolbar] = toolbar; 27 this[ScaffoldSlots.toolbar] = toolbar;
28 this[ScaffoldSlots.body] = body; 28 this[ScaffoldSlots.body] = body;
29 this[ScaffoldSlots.statusBar] = statusbar; 29 this[ScaffoldSlots.statusBar] = statusBar;
30 this[ScaffoldSlots.drawer] = drawer; 30 this[ScaffoldSlots.drawer] = drawer;
31 this[ScaffoldSlots.floatingActionButton] = floatingActionButton; 31 this[ScaffoldSlots.floatingActionButton] = floatingActionButton;
32 } 32 }
33 33
34 Map<ScaffoldSlots, RenderBox> _slots = new Map<ScaffoldSlots, RenderBox>(); 34 Map<ScaffoldSlots, RenderBox> _slots = new Map<ScaffoldSlots, RenderBox>();
35 RenderBox operator[] (ScaffoldSlots slot) => _slots[slot]; 35 RenderBox operator[] (ScaffoldSlots slot) => _slots[slot];
36 void operator[]= (ScaffoldSlots slot, RenderBox value) { 36 void operator[]= (ScaffoldSlots slot, RenderBox value) {
37 RenderBox old = _slots[slot]; 37 RenderBox old = _slots[slot];
38 if (old == value) 38 if (old == value)
39 return; 39 return;
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 if (_slots[ScaffoldSlots.toolbar] != null) { 90 if (_slots[ScaffoldSlots.toolbar] != null) {
91 RenderBox toolbar = _slots[ScaffoldSlots.toolbar]; 91 RenderBox toolbar = _slots[ScaffoldSlots.toolbar];
92 double toolbarHeight = kToolBarHeight + kNotificationAreaHeight; 92 double toolbarHeight = kToolBarHeight + kNotificationAreaHeight;
93 toolbar.layout(new BoxConstraints.tight(new Size(size.width, toolbarHeight ))); 93 toolbar.layout(new BoxConstraints.tight(new Size(size.width, toolbarHeight )));
94 assert(toolbar.parentData is BoxParentData); 94 assert(toolbar.parentData is BoxParentData);
95 toolbar.parentData.position = Point.origin; 95 toolbar.parentData.position = Point.origin;
96 bodyPosition += toolbarHeight; 96 bodyPosition += toolbarHeight;
97 bodyHeight -= toolbarHeight; 97 bodyHeight -= toolbarHeight;
98 } 98 }
99 if (_slots[ScaffoldSlots.statusBar] != null) { 99 if (_slots[ScaffoldSlots.statusBar] != null) {
100 RenderBox statusbar = _slots[ScaffoldSlots.statusBar]; 100 RenderBox statusBar = _slots[ScaffoldSlots.statusBar];
101 statusbar.layout(new BoxConstraints.tight(new Size(size.width, kStatusbarH eight))); 101 statusBar.layout(new BoxConstraints.tight(new Size(size.width, kStatusBarH eight)));
102 assert(statusbar.parentData is BoxParentData); 102 assert(statusBar.parentData is BoxParentData);
103 statusbar.parentData.position = new Point(0.0, size.height - kStatusbarHei ght); 103 statusBar.parentData.position = new Point(0.0, size.height - kStatusBarHei ght);
104 bodyHeight -= kStatusbarHeight; 104 bodyHeight -= kStatusBarHeight;
105 } 105 }
106 if (_slots[ScaffoldSlots.body] != null) { 106 if (_slots[ScaffoldSlots.body] != null) {
107 RenderBox body = _slots[ScaffoldSlots.body]; 107 RenderBox body = _slots[ScaffoldSlots.body];
108 body.layout(new BoxConstraints.tight(new Size(size.width, bodyHeight))); 108 body.layout(new BoxConstraints.tight(new Size(size.width, bodyHeight)));
109 assert(body.parentData is BoxParentData); 109 assert(body.parentData is BoxParentData);
110 body.parentData.position = new Point(0.0, bodyPosition); 110 body.parentData.position = new Point(0.0, bodyPosition);
111 } 111 }
112 if (_slots[ScaffoldSlots.drawer] != null) { 112 if (_slots[ScaffoldSlots.drawer] != null) {
113 RenderBox drawer = _slots[ScaffoldSlots.drawer]; 113 RenderBox drawer = _slots[ScaffoldSlots.drawer];
114 drawer.layout(new BoxConstraints(minWidth: 0.0, maxWidth: size.width, minH eight: size.height, maxHeight: size.height)); 114 drawer.layout(new BoxConstraints(minWidth: 0.0, maxWidth: size.width, minH eight: size.height, maxHeight: size.height));
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 class Scaffold extends RenderObjectWrapper { 155 class Scaffold extends RenderObjectWrapper {
156 156
157 // static final Style _style = new Style(''' 157 // static final Style _style = new Style('''
158 // ${typography.typeface}; 158 // ${typography.typeface};
159 // ${typography.black.body1};'''); 159 // ${typography.black.body1};''');
160 160
161 Scaffold({ 161 Scaffold({
162 Object key, 162 Object key,
163 UINode toolbar, 163 UINode toolbar,
164 UINode body, 164 UINode body,
165 UINode statusbar, 165 UINode statusBar,
166 UINode drawer, 166 UINode drawer,
167 UINode floatingActionButton 167 UINode floatingActionButton
168 }) : _toolbar = toolbar, 168 }) : _toolbar = toolbar,
169 _body = body, 169 _body = body,
170 _statusbar = statusbar, 170 _statusBar = statusBar,
171 _drawer = drawer, 171 _drawer = drawer,
172 _floatingActionButton = floatingActionButton, 172 _floatingActionButton = floatingActionButton,
173 super(key: key); 173 super(key: key);
174 174
175 UINode _toolbar; 175 UINode _toolbar;
176 UINode _body; 176 UINode _body;
177 UINode _statusbar; 177 UINode _statusBar;
178 UINode _drawer; 178 UINode _drawer;
179 UINode _floatingActionButton; 179 UINode _floatingActionButton;
180 180
181 RenderScaffold get root => super.root as RenderScaffold; 181 RenderScaffold get root => super.root as RenderScaffold;
182 RenderScaffold createNode() => new RenderScaffold(); 182 RenderScaffold createNode() => new RenderScaffold();
183 183
184 void insert(RenderObjectWrapper child, ScaffoldSlots slot) { 184 void insert(RenderObjectWrapper child, ScaffoldSlots slot) {
185 root[slot] = child != null ? child.root : null; 185 root[slot] = child != null ? child.root : null;
186 } 186 }
187 187
188 void removeChild(UINode node) { 188 void removeChild(UINode node) {
189 assert(node != null); 189 assert(node != null);
190 root.remove(node.root); 190 root.remove(node.root);
191 super.removeChild(node); 191 super.removeChild(node);
192 } 192 }
193 193
194 void remove() { 194 void remove() {
195 if (_toolbar != null) 195 if (_toolbar != null)
196 removeChild(_toolbar); 196 removeChild(_toolbar);
197 if (_body != null) 197 if (_body != null)
198 removeChild(_body); 198 removeChild(_body);
199 if (_statusbar != null) 199 if (_statusBar != null)
200 removeChild(_statusbar); 200 removeChild(_statusBar);
201 if (_drawer != null) 201 if (_drawer != null)
202 removeChild(_drawer); 202 removeChild(_drawer);
203 if (_floatingActionButton != null) 203 if (_floatingActionButton != null)
204 removeChild(_floatingActionButton); 204 removeChild(_floatingActionButton);
205 super.remove(); 205 super.remove();
206 } 206 }
207 207
208 void syncRenderObject(UINode old) { 208 void syncRenderObject(UINode old) {
209 super.syncRenderObject(old); 209 super.syncRenderObject(old);
210 _toolbar = syncChild(_toolbar, old is Scaffold ? old._toolbar : null, Scaffo ldSlots.toolbar); 210 _toolbar = syncChild(_toolbar, old is Scaffold ? old._toolbar : null, Scaffo ldSlots.toolbar);
211 _body = syncChild(_body, old is Scaffold ? old._body : null, ScaffoldSlots.b ody); 211 _body = syncChild(_body, old is Scaffold ? old._body : null, ScaffoldSlots.b ody);
212 _statusbar = syncChild(_statusbar, old is Scaffold ? old._statusbar : null, ScaffoldSlots.statusBar); 212 _statusBar = syncChild(_statusBar, old is Scaffold ? old._statusBar : null, ScaffoldSlots.statusBar);
213 _drawer = syncChild(_drawer, old is Scaffold ? old._drawer : null, ScaffoldS lots.drawer); 213 _drawer = syncChild(_drawer, old is Scaffold ? old._drawer : null, ScaffoldS lots.drawer);
214 _floatingActionButton = syncChild(_floatingActionButton, old is Scaffold ? o ld._floatingActionButton : null, ScaffoldSlots.floatingActionButton); 214 _floatingActionButton = syncChild(_floatingActionButton, old is Scaffold ? o ld._floatingActionButton : null, ScaffoldSlots.floatingActionButton);
215 } 215 }
216 216
217 } 217 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698