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

[poincare] Fix DynamicLayoutHierarchy::mergeChildrenAtIndex

Browse Source 
Change-Id: I579d3daf9791e06474a66071b2b2be0908a8cf02
This commit is contained in:
Léa Saviot
2018-05-08 12:02:21 +02:00
parent 66d2eb0e7a
commit 3fcfbcf833
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,11 +37,15 @@ DynamicLayoutHierarchy::~DynamicLayoutHierarchy() {
}
void DynamicLayoutHierarchy::mergeChildrenAtIndex(DynamicLayoutHierarchy * eL, int index, bool removeEmptyChildren) {
int indexForInsertion = index;
int indexOfEL = indexOfChild(eL);
if (indexOfEL >= 0) {
removeChildAtIndex(indexOfEL, false);
if (indexOfEL < index) {
indexForInsertion--;
}
}
addChildrenAtIndex(eL->children(), eL->numberOfChildren(), index, removeEmptyChildren);
addChildrenAtIndex(eL->children(), eL->numberOfChildren(), indexForInsertion, removeEmptyChildren);
eL->detachChildren();
delete eL;
}