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

[poincare] Fix Layout::replaceWithJuxtapositionOf

Browse Source
This commit is contained in:
Léa Saviot
2019-04-10 16:07:32 +02:00
committed by Émilie Feral
parent 057939dd3f
commit 22b7853dfa
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
poincare/src/layout.cpp
View File

@@ -99,7 +99,7 @@ void Layout::replaceWithJuxtapositionOf(Layout leftChild, Layout rightChild, Lay
* replaceWith. */
HorizontalLayout horizontalLayoutR = HorizontalLayout::Builder();
p.replaceChild(*this, horizontalLayoutR, cursor);
horizontalLayoutR.addOrMergeChildAtIndex(leftChild, 0, false);
horizontalLayoutR.addOrMergeChildAtIndex(leftChild, 0, true);
if (putCursorInTheMiddle) {
if (!horizontalLayoutR.isEmpty()) {
cursor->setLayout(horizontalLayoutR.childAtIndex(horizontalLayoutR.numberOfChildren()-1));
@@ -109,7 +109,7 @@ void Layout::replaceWithJuxtapositionOf(Layout leftChild, Layout rightChild, Lay
cursor->setPosition(LayoutCursor::Position::Left);
}
}
horizontalLayoutR.addOrMergeChildAtIndex(rightChild, 1, false);
horizontalLayoutR.addOrMergeChildAtIndex(rightChild, horizontalLayoutR.numberOfChildren(), true);
return;
}
/* The parent is an Horizontal layout, so directly add the two juxtaposition