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

[poincare] Better removal of empty child in HorizontalLayout

Browse Source 
Change-Id: I126af718ec8a983b22f07ab49fd3298b8b416ea5
This commit is contained in:
Léa Saviot
2018-01-29 15:29:58 +01:00
parent 40ef1d1caa
commit 8d62aa90f8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
poincare/src/layout/horizontal_layout.cpp
View File

@@ -166,7 +166,7 @@ void HorizontalLayout::privateReplaceChild(const ExpressionLayout * oldChild, Ex
void HorizontalLayout::addOrMergeChildAtIndex(ExpressionLayout * eL, int index, bool removeEmptyChildren) {
int newIndex = index;
if (numberOfChildren() > 0 && child(0)->isEmpty()) {
if (numberOfChildren() > 0 && child(0)->isEmpty() && (numberOfChildren() < 1 || !child(1)->mustHaveLeftBrother())) {
removeChildAtIndex(0, true);
newIndex = index == 0 ? 0 : index - 1;
}
@@ -371,12 +371,12 @@ void HorizontalLayout::privateAddBrother(ExpressionLayoutCursor * cursor, Expres
return;
}
assert(cursor->position() == ExpressionLayoutCursor::Position::Right);
// If the first child is empty, remove it before adding the layout.
// If the last child is empty, remove it before adding the layout.
int childrenCount = numberOfChildren();
if (childrenCount > 0 && editableChild(childrenCount - 1)->isEmpty()) {
removeChildAtIndex(childrenCount - 1, true);
}
addOrMergeChildAtIndex(brother, childrenCount, false);
addOrMergeChildAtIndex(brother, numberOfChildren(), false);
if (moveCursor) {
cursor->setPointedExpressionLayout(this);
}