From 22b7853dfa9111b4bc948288fad1245c64d2ccdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Wed, 10 Apr 2019 16:07:32 +0200 Subject: [PATCH] [poincare] Fix Layout::replaceWithJuxtapositionOf --- poincare/src/layout.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/poincare/src/layout.cpp b/poincare/src/layout.cpp index d55906954..98641e9bd 100644 --- a/poincare/src/layout.cpp +++ b/poincare/src/layout.cpp @@ -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