From 1d954db19d1c4962f48dfdf715f2f1dced37537c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9a=20Saviot?= <lea.saviot@numworks.com>
Date: Thu, 9 Jan 2020 11:36:16 +0100
Subject: [PATCH] [poincare/layout_cursor] Better empty layout handling in
 selectLeftRight

---
 poincare/src/layout_cursor.cpp | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/poincare/src/layout_cursor.cpp b/poincare/src/layout_cursor.cpp
index 9046e8d8f..548f2e0d4 100644
--- a/poincare/src/layout_cursor.cpp
+++ b/poincare/src/layout_cursor.cpp
@@ -316,13 +316,17 @@ void LayoutCursor::selectLeftRight(bool right, bool * shouldRecomputeLayout, Lay
   Position ingoingPosition = right ? Position::Left : Position::Right;
   Position outgoingPosition = right ? Position::Right : Position::Left;
 
-  // Find the layout to select
+  // Handle empty layouts
+  bool currentLayoutIsEmpty = m_layout.type() == LayoutNode::Type::EmptyLayout;
+  if (currentLayoutIsEmpty) {
+    m_position = outgoingPosition;
+  }
 
+  // Find the layout to select
   LayoutCursor equivalentCursor = m_layout.equivalentCursor(this);
   Layout equivalentLayout = equivalentCursor.layout();
-  bool currentLayoutIsEmpty = m_layout.type() == LayoutNode::Type::EmptyLayout;
 
-  if (!currentLayoutIsEmpty && m_position == ingoingPosition) {
+  if (m_position == ingoingPosition) {
     /* The current cursor is positionned on the ingoing position, for instance
      * left a layout if we want to select towards the right. */
     if (!equivalentLayout.isUninitialized() && m_layout.hasChild(equivalentLayout)) {
@@ -337,14 +341,16 @@ void LayoutCursor::selectLeftRight(bool right, bool * shouldRecomputeLayout, Lay
       *selection = m_layout;
     }
   } else {
-    assert(currentLayoutIsEmpty || m_position == outgoingPosition);
     /* The cursor is on the outgoing position, for instance right of a layout
      * when we want to select towards the right. */
-    if (!currentLayoutIsEmpty && !equivalentLayout.isUninitialized() && equivalentCursor.position() == ingoingPosition) {
+    if (!equivalentLayout.isUninitialized() && equivalentCursor.position() == ingoingPosition) {
       /* If there is an equivalent layout positionned on the ingoing position,
-       * select it. */
+       * try the algorithm with it. */
       assert(equivalentLayout.type() != LayoutNode::Type::HorizontalLayout);
-      *selection = equivalentLayout;
+      m_layout = equivalentLayout;
+      m_position = ingoingPosition;
+      selectLeftRight(right, shouldRecomputeLayout, selection);
+      return;
     } else {
       // Else, find the first non horizontal ancestor and select it.
       Layout notHorizontalAncestor = m_layout.parent();