From 2d2eb8c9aa9692df7395be3139ff1cc47c60349d Mon Sep 17 00:00:00 2001 From: Evann DREUMONT Date: Fri, 17 Jul 2020 20:36:32 +0000 Subject: [PATCH] [Fix] Fixed non-erasable empty character --- poincare/src/layout_cursor.cpp | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/poincare/src/layout_cursor.cpp b/poincare/src/layout_cursor.cpp index 854c9f4bc..926c17bba 100644 --- a/poincare/src/layout_cursor.cpp +++ b/poincare/src/layout_cursor.cpp @@ -125,17 +125,11 @@ void LayoutCursor::addLog() { } void LayoutCursor::addEmptyLog() { - HorizontalLayout child1 = HorizontalLayout::Builder(EmptyLayout::Builder()); - HorizontalLayout child2 = HorizontalLayout::Builder(EmptyLayout::Builder()); Layout logLayout = LayoutHelper::String("log", 3); HorizontalLayout resultLayout = static_cast(logLayout); - //VerticalOffsetLayout offsetLayout = VerticalOffsetLayout::Builder(child2, VerticalOffsetLayoutNode::Position::Subscript); - //resultLayout.addChildAtIndex(offsetLayout, resultLayout.numberOfChildren(), resultLayout.numberOfChildren(), nullptr); resultLayout.addChildAtIndex(HorizontalLayout::Builder( LeftParenthesisLayout::Builder(), - child1, RightParenthesisLayout::Builder() - ), resultLayout.numberOfChildren(), resultLayout.numberOfChildren(), nullptr); m_layout.addSibling(this, resultLayout, true); @@ -143,17 +137,14 @@ void LayoutCursor::addEmptyLog() { } void LayoutCursor::addEmpty10Log() { - HorizontalLayout child1 = HorizontalLayout::Builder(EmptyLayout::Builder()); - HorizontalLayout child2 = HorizontalLayout::Builder(CodePointLayout::Builder('1'),CodePointLayout::Builder('0')); + HorizontalLayout child = HorizontalLayout::Builder(CodePointLayout::Builder('1'),CodePointLayout::Builder('0')); Layout logLayout = LayoutHelper::String("log", 3); HorizontalLayout resultLayout = static_cast(logLayout); - VerticalOffsetLayout offsetLayout = VerticalOffsetLayout::Builder(child2, VerticalOffsetLayoutNode::Position::Subscript); + VerticalOffsetLayout offsetLayout = VerticalOffsetLayout::Builder(child, VerticalOffsetLayoutNode::Position::Subscript); resultLayout.addChildAtIndex(offsetLayout, resultLayout.numberOfChildren(), resultLayout.numberOfChildren(), nullptr); resultLayout.addChildAtIndex(HorizontalLayout::Builder( LeftParenthesisLayout::Builder(), - child1, RightParenthesisLayout::Builder() - ), resultLayout.numberOfChildren(), resultLayout.numberOfChildren(), nullptr); m_layout.addSibling(this, resultLayout, true); @@ -161,17 +152,14 @@ void LayoutCursor::addEmpty10Log() { } void LayoutCursor::addEmptyArgLog() { - HorizontalLayout child1 = HorizontalLayout::Builder(EmptyLayout::Builder()); - HorizontalLayout child2 = HorizontalLayout::Builder(EmptyLayout::Builder()); + HorizontalLayout child = HorizontalLayout::Builder(EmptyLayout::Builder()); Layout logLayout = LayoutHelper::String("log", 3); HorizontalLayout resultLayout = static_cast(logLayout); - VerticalOffsetLayout offsetLayout = VerticalOffsetLayout::Builder(child2, VerticalOffsetLayoutNode::Position::Subscript); + VerticalOffsetLayout offsetLayout = VerticalOffsetLayout::Builder(child, VerticalOffsetLayoutNode::Position::Subscript); resultLayout.addChildAtIndex(offsetLayout, resultLayout.numberOfChildren(), resultLayout.numberOfChildren(), nullptr); resultLayout.addChildAtIndex(HorizontalLayout::Builder( LeftParenthesisLayout::Builder(), - child1, RightParenthesisLayout::Builder() - ), resultLayout.numberOfChildren(), resultLayout.numberOfChildren(), nullptr); m_layout.addSibling(this, resultLayout, true);