From 5787d50a4552921f2299dfbd5e03d0b9e0737d75 Mon Sep 17 00:00:00 2001
From: Ruben Dashyan <ruben.dashyan@numworks.com>
Date: Tue, 15 Oct 2019 16:31:26 +0200
Subject: [PATCH] Revert "[apps/calculation/edit_expression_controller] Define
 viewWillAppear"

This reverts commit 960736203ff2f816688868e3397d178d931fa3c3.
---
 apps/calculation/edit_expression_controller.cpp |  2 ++
 apps/calculation/history_controller.cpp         | 10 ++++------
 apps/calculation/history_controller.h           |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/calculation/edit_expression_controller.cpp b/apps/calculation/edit_expression_controller.cpp
index df76015ab..37aeb7973 100644
--- a/apps/calculation/edit_expression_controller.cpp
+++ b/apps/calculation/edit_expression_controller.cpp
@@ -52,6 +52,8 @@ void EditExpressionController::insertTextBody(const char * text) {
 }
 
 void EditExpressionController::didBecomeFirstResponder() {
+  int lastRow = m_calculationStore->numberOfCalculations() > 0 ? m_calculationStore->numberOfCalculations()-1 : 0;
+  m_historyController->scrollToCell(0, lastRow);
   m_contentView.expressionField()->setEditing(true, false);
   Container::activeApp()->setFirstResponder(m_contentView.expressionField());
 }
diff --git a/apps/calculation/history_controller.cpp b/apps/calculation/history_controller.cpp
index d96789e4c..b3fb5b2ce 100644
--- a/apps/calculation/history_controller.cpp
+++ b/apps/calculation/history_controller.cpp
@@ -18,12 +18,6 @@ HistoryController::HistoryController(Responder * parentResponder, CalculationSto
   }
 }
 
-void HistoryController::viewWillAppear() {
-  int rowsCount = numberOfRows();
-  int lastRow = (rowsCount > 0) * (rowsCount - 1);
-  selectCellAtLocation(0, lastRow);
-}
-
 void HistoryController::reload() {
   m_selectableTableView.reloadData();
   /* TODO
@@ -174,6 +168,10 @@ int HistoryController::typeAtLocation(int i, int j) {
   return 0;
 }
 
+void HistoryController::scrollToCell(int i, int j) {
+  m_selectableTableView.scrollToCell(i, j);
+}
+
 HistoryViewCell * HistoryController::historyViewCellDidChangeSelection() {
   /* Update the whole table as the height of the selected cell row might have
    * changed. */
diff --git a/apps/calculation/history_controller.h b/apps/calculation/history_controller.h
index 06d108c8d..f75c20015 100644
--- a/apps/calculation/history_controller.h
+++ b/apps/calculation/history_controller.h
@@ -14,7 +14,6 @@ class HistoryController : public ViewController, public ListViewDataSource, publ
 public:
   HistoryController(Responder * parentResponder, CalculationStore * calculationStore);
   View * view() override { return &m_selectableTableView; }
-  void viewWillAppear() override;
   bool handleEvent(Ion::Events::Event event) override;
   void didBecomeFirstResponder() override;
   void willExitResponderChain(Responder * nextFirstResponder) override;
@@ -26,6 +25,7 @@ public:
   KDCoordinate rowHeight(int j) override;
   int typeAtLocation(int i, int j) override;
   void tableViewDidChangeSelection(SelectableTableView * t, int previousSelectedCellX, int previousSelectedCellY, bool withinTemporarySelection = false) override;
+  void scrollToCell(int i, int j);
 private:
   int storeIndex(int i) { return numberOfRows() - i - 1; }
   Shared::ExpiringPointer<Calculation> calculationAtIndex(int i);