From 167827f0e4b29b6931c961b8a77d8fcab9c175ee Mon Sep 17 00:00:00 2001 From: Ruben Dashyan Date: Wed, 11 Mar 2020 15:24:36 +0100 Subject: [PATCH] [apps/calculation] EditExpressionController accesses subview directly --- apps/calculation/edit_expression_controller.cpp | 2 +- apps/calculation/history_controller.cpp | 4 ---- apps/calculation/history_controller.h | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/apps/calculation/edit_expression_controller.cpp b/apps/calculation/edit_expression_controller.cpp index b0eb752c9..b02f63211 100644 --- a/apps/calculation/edit_expression_controller.cpp +++ b/apps/calculation/edit_expression_controller.cpp @@ -54,7 +54,7 @@ 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.mainView()->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 5f7424105..50a3b8591 100644 --- a/apps/calculation/history_controller.cpp +++ b/apps/calculation/history_controller.cpp @@ -223,10 +223,6 @@ int HistoryController::typeAtLocation(int i, int j) { return 0; } -void HistoryController::scrollToCell(int i, int j) { - m_selectableTableView.scrollToCell(i, j); -} - bool HistoryController::calculationAtIndexToggles(int index) { Context * context = App::app()->localContext(); return index >= 0 && index < m_calculationStore->numberOfCalculations() && calculationAtIndex(index)->displayOutput(context) == Calculation::DisplayOutput::ExactAndApproximateToggle; diff --git a/apps/calculation/history_controller.h b/apps/calculation/history_controller.h index 407e52805..606637edb 100644 --- a/apps/calculation/history_controller.h +++ b/apps/calculation/history_controller.h @@ -31,7 +31,6 @@ 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 calculationAtIndex(int i);