UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-21 23:00:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

[poincare] Clean EmptyLayoutNode::willAddSibling

Browse Source
This commit is contained in:
Léa Saviot
2018-08-01 10:44:22 +02:00
parent b9b3feffa3
commit d84a081e7e
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
poincare/src/empty_layout_node.cpp
View File

@@ -75,19 +75,17 @@ bool EmptyLayoutNode::willAddSibling(LayoutCursor * cursor, LayoutNode * sibling
if (m_color == Color::Grey) {
/* The parent is a MatrixLayout, and the current empty row or column is
* being filled in, so add a new empty row or column. */
LayoutRef rootRef = LayoutRef(root());
LayoutNode * parentNode = parent();
assert(parentNode != nullptr);
LayoutRef parentRef(parentNode);
parentNode->willAddSiblingToEmptyChildAtIndex(parentRef.indexOfChild(thisRef));
parentNode->willAddSiblingToEmptyChildAtIndex(parentNode->indexOfChild(this));
// WARNING: Do not use previous node pointers afterwards.
bool shouldContinueAddition = !(parentRef.isAllocationFailure());
if (!shouldContinueAddition) {
if (rootRef.isAllocationFailure()) {
if (moveCursor) {
cursor->setLayoutReference(parentRef);
cursor->setLayoutReference(rootRef);
}
return false;
}
}
if (siblingRef.mustHaveLeftSibling()) {
thisRef.setColor(Color::Yellow);