From e60cf7cea359d62401ae71c247e2fdf5528dbfd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9a=20Saviot?= <lea.saviot@numworks.com>
Date: Mon, 16 Apr 2018 11:19:30 +0200
Subject: [PATCH] [escher] Clean code.

Change-Id: I081aa2ac6b1be4df034aeac0e274379e9daa2afd
---
 .../src/scrollable_expression_view_with_cursor.cpp  | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/escher/src/scrollable_expression_view_with_cursor.cpp b/escher/src/scrollable_expression_view_with_cursor.cpp
index c80e887a8..3860ea167 100644
--- a/escher/src/scrollable_expression_view_with_cursor.cpp
+++ b/escher/src/scrollable_expression_view_with_cursor.cpp
@@ -40,21 +40,18 @@ Toolbox * ScrollableExpressionViewWithCursor::toolbox() {
 bool ScrollableExpressionViewWithCursor::handleEvent(Ion::Events::Event event) {
   KDSize previousSize = minimalSizeForOptimalDisplay();
   bool shouldRecomputeLayout = false;
+  bool didHandleEvent = false;
   if (privateHandleMoveEvent(event, &shouldRecomputeLayout)) {
     if (!shouldRecomputeLayout) {
       m_expressionViewWithCursor.cursorPositionChanged();
       scrollToCursor();
       return true;
     }
-    reload();
-    KDSize newSize = minimalSizeForOptimalDisplay();
-    if (m_delegate && previousSize.height() != newSize.height()) {
-      m_delegate->scrollableExpressionViewWithCursorDidChangeSize(this);
-      reload();
-    }
-    return true;
+    didHandleEvent = true;
+  } else if (privateHandleEvent(event)) {
+    didHandleEvent = true;
   }
-  if (privateHandleEvent(event)) {
+  if (didHandleEvent) {
     reload();
     KDSize newSize = minimalSizeForOptimalDisplay();
     if (m_delegate && previousSize.height() != newSize.height()) {