From d34ee9ceeebc06a6116d34c065320ed8035b2218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Fri, 14 Sep 2018 17:19:51 +0200 Subject: [PATCH] [poincare] Fix empty layout insertion in horizontal layout --- poincare/src/horizontal_layout.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/poincare/src/horizontal_layout.cpp b/poincare/src/horizontal_layout.cpp index 9b751eaca..d78e0cb35 100644 --- a/poincare/src/horizontal_layout.cpp +++ b/poincare/src/horizontal_layout.cpp @@ -388,7 +388,12 @@ void HorizontalLayoutReference::addOrMergeChildAtIndex(LayoutReference l, int in } void HorizontalLayoutReference::addChildAtIndex(LayoutReference l, int index, int currentNumberOfChildren, LayoutCursor * cursor, bool removeEmptyChildren) { - if (!removeEmptyChildren || !l.isEmpty()) { + if (!removeEmptyChildren + || !l.isEmpty() + || numberOfChildren() == 0 + || (index < numberOfChildren() + && childAtIndex(index).mustHaveLeftSibling())) + { LayoutReference::addChildAtIndex(l, index, currentNumberOfChildren, cursor); } }