DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when removing layout managers.

Browse Source 
We weren't correctly marking an element as needing style
recalc if it was *losing* it's layout manager. We were
only doing so when it was gaining a layout manager for
the first time.

Review URL: https://codereview.chromium.org/1082273004
This commit is contained in:
Ojan Vafai 2015-04-14 13:57:07 -07:00
parent c71545ef1f
commit 893d8ae2e7
1 changed files with 40 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
engine/src/flutter/tests/layout/custom.sky
View File

@ -1,9 +1,11 @@
<parent style='background-color: lightblue;'>
<child style='background-color: pink;'>
<grandchild style='background-color: red; width: 25px; height: 25px;'></grandchild>
</child>
<child2 style='background-color: salmon; height: 25px;' />
</parent>
<root style="width: 300px">
<parent style='background-color: lightblue;'>
<child style='background-color: pink;'>
<grandchild style='background-color: red; width: 25px; height: 25px;'></grandchild>
</child>
<child2 style='background-color: salmon; height: 25px;' />
</parent>
</root>
<script>
import "../resources/third_party/unittest/unittest.dart";
@ -20,6 +22,7 @@ void main() {
var parent = document.querySelector('parent');
var firstChild = parent.firstElementChild;
var secondChild = parent.lastElementChild;
var grandChild = document.querySelector('grandchild');
parent.setLayoutManager(() {
if (first) {
@ -58,6 +61,11 @@ void main() {
expect(secondChild.offsetHeight, equals(25));
expect(secondChild.offsetTop, equals(0));
expect(secondChild.offsetLeft, equals(0));
expect(grandChild.offsetWidth, equals(25));
expect(grandChild.offsetHeight, equals(25));
expect(secondChild.offsetTop, equals(0));
expect(secondChild.offsetLeft, equals(0));
};
test("should have the right sizes after layout", () {
@ -75,7 +83,32 @@ void main() {
expect(parent.offsetWidth, equals(150));
expect(secondChild.offsetWidth, equals(150));
assertNonChangingValues();
completer.complete();
parent.setLayoutManager(null);
window.requestAnimationFrame((_) {
expect(parent.offsetWidth, equals(300));
expect(parent.offsetHeight, equals(50));
expect(parent.offsetTop, equals(0));
expect(parent.offsetLeft, equals(0));
expect(firstChild.offsetWidth, equals(300));
expect(firstChild.offsetHeight, equals(25));
expect(firstChild.offsetTop, equals(0));
expect(firstChild.offsetLeft, equals(0));
expect(secondChild.offsetWidth, equals(300));
expect(secondChild.offsetHeight, equals(25));
expect(secondChild.offsetTop, equals(25));
expect(secondChild.offsetLeft, equals(0));
expect(grandChild.offsetWidth, equals(25));
expect(grandChild.offsetHeight, equals(25));
expect(grandChild.offsetTop, equals(0));
expect(grandChild.offsetLeft, equals(0));
completer.complete();
});
});
});