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] addLayoutAndMoveCursor collapses only if layout is not AFail

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

3
poincare/src/layout_cursor.cpp
View File

@@ -213,9 +213,10 @@ void LayoutCursor::insertText(const char * text) {
}
void LayoutCursor::addLayoutAndMoveCursor(LayoutRef l) {
LayoutRef rootRef = m_layoutRef.root();
bool layoutWillBeMerged = l.isHorizontal();
m_layoutRef.addSibling(this, l, true);
if (!layoutWillBeMerged) {
if (!rootRef.isAllocationFailure() && !layoutWillBeMerged) {
l.collapseSiblings(this);
}
}