From 790c9c7be322323376c94ff69c2bf72ee2e9cfc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Wed, 9 May 2018 13:50:35 +0200 Subject: [PATCH] [poincare] Clean EmptyLayout Change-Id: I880a66c79c440912ff6bbcc86c6f22d3bdb8a5ad --- poincare/src/layout/empty_layout.cpp | 10 ++-------- poincare/src/layout/empty_layout.h | 4 +--- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/poincare/src/layout/empty_layout.cpp b/poincare/src/layout/empty_layout.cpp index d68a86e33..6d1acc880 100644 --- a/poincare/src/layout/empty_layout.cpp +++ b/poincare/src/layout/empty_layout.cpp @@ -45,15 +45,9 @@ ExpressionLayoutCursor EmptyLayout::cursorRightOf(ExpressionLayoutCursor cursor, return ExpressionLayoutCursor(); } -ExpressionLayoutCursor EmptyLayout::cursorAbove(ExpressionLayoutCursor cursor, bool * shouldRecomputeLayout, bool equivalentPositionVisited) { - return cursorVerticalOf(VerticalDirection::Up, cursor, shouldRecomputeLayout, equivalentPositionVisited); -} - -ExpressionLayoutCursor EmptyLayout::cursorUnder(ExpressionLayoutCursor cursor, bool * shouldRecomputeLayout, bool equivalentPositionVisited) { - return cursorVerticalOf(VerticalDirection::Down, cursor, shouldRecomputeLayout, equivalentPositionVisited); -} - ExpressionLayoutCursor EmptyLayout::cursorVerticalOf(VerticalDirection direction, ExpressionLayoutCursor cursor, bool * shouldRecomputeLayout, bool equivalentPositionVisited) { + /* The two cursor positions around an EmptyLayout are equivalent, so both + * should be checked. */ assert(cursor.pointedExpressionLayout() == this); ExpressionLayoutCursor cursorResult = direction == VerticalDirection::Up ? ExpressionLayout::cursorAbove(cursor, shouldRecomputeLayout, equivalentPositionVisited) : diff --git a/poincare/src/layout/empty_layout.h b/poincare/src/layout/empty_layout.h index 70f48333a..4f72e5b7f 100644 --- a/poincare/src/layout/empty_layout.h +++ b/poincare/src/layout/empty_layout.h @@ -17,8 +17,6 @@ public: void deleteBeforeCursor(ExpressionLayoutCursor * cursor) override; ExpressionLayoutCursor cursorLeftOf(ExpressionLayoutCursor cursor, bool * shouldRecomputeLayout) override; ExpressionLayoutCursor cursorRightOf(ExpressionLayoutCursor cursor, bool * shouldRecomputeLayout) override; - ExpressionLayoutCursor cursorAbove(ExpressionLayoutCursor cursor, bool * shouldRecomputeLayout, bool equivalentPositionVisited = false) override; - ExpressionLayoutCursor cursorUnder(ExpressionLayoutCursor cursor, bool * shouldRecomputeLayout, bool equivalentPositionVisited = false) override; int writeTextInBuffer(char * buffer, int bufferSize, int numberOfSignificantDigits = PrintFloat::k_numberOfStoredSignificantDigits) const override; bool isEmpty() const override { return true; } Color color() const { return m_color; } @@ -40,7 +38,7 @@ private: constexpr static KDCoordinate k_marginWidth = 1; constexpr static KDCoordinate k_marginHeight = 3; constexpr static KDCoordinate k_lineThickness = 1; - ExpressionLayoutCursor cursorVerticalOf(VerticalDirection direction, ExpressionLayoutCursor cursor, bool * shouldRecomputeLayout, bool equivalentPositionVisited); + ExpressionLayoutCursor cursorVerticalOf(VerticalDirection direction, ExpressionLayoutCursor cursor, bool * shouldRecomputeLayout, bool equivalentPositionVisited) override; bool m_isVisible; Color m_color; };