diff --git a/apps/calculation/history_controller.cpp b/apps/calculation/history_controller.cpp index a817a6598..4798db0d6 100644 --- a/apps/calculation/history_controller.cpp +++ b/apps/calculation/history_controller.cpp @@ -37,6 +37,7 @@ void HistoryController::reload() { } void HistoryController::viewWillAppear() { + ViewController::viewWillAppear(); reload(); } diff --git a/apps/code/console_controller.cpp b/apps/code/console_controller.cpp index f1ca31570..ba9dd2065 100644 --- a/apps/code/console_controller.cpp +++ b/apps/code/console_controller.cpp @@ -162,6 +162,7 @@ const char * ConsoleController::inputText(const char * prompt) { } void ConsoleController::viewWillAppear() { + ViewController::viewWillAppear(); loadPythonEnvironment(); if (m_importScriptsWhenViewAppears) { m_importScriptsWhenViewAppears = false; diff --git a/apps/code/editor_controller.cpp b/apps/code/editor_controller.cpp index b4fd1ff2a..863a29191 100644 --- a/apps/code/editor_controller.cpp +++ b/apps/code/editor_controller.cpp @@ -59,6 +59,7 @@ void EditorController::didBecomeFirstResponder() { } void EditorController::viewWillAppear() { + ViewController::viewWillAppear(); m_editorView.loadSyntaxHighlighter(); m_editorView.setCursorLocation(m_editorView.text() + strlen(m_editorView.text())); } diff --git a/apps/code/menu_controller.cpp b/apps/code/menu_controller.cpp index 67d2e7f55..e07632993 100644 --- a/apps/code/menu_controller.cpp +++ b/apps/code/menu_controller.cpp @@ -79,6 +79,7 @@ void MenuController::didBecomeFirstResponder() { } void MenuController::viewWillAppear() { + ViewController::viewWillAppear(); updateAddScriptRowDisplay(); } diff --git a/apps/code/script_parameter_controller.cpp b/apps/code/script_parameter_controller.cpp index 7a8e67b23..ab31e778d 100644 --- a/apps/code/script_parameter_controller.cpp +++ b/apps/code/script_parameter_controller.cpp @@ -61,6 +61,7 @@ bool ScriptParameterController::handleEvent(Ion::Events::Event event) { } void ScriptParameterController::viewWillAppear() { + ViewController::viewWillAppear(); m_selectableTableView.reloadData(); m_selectableTableView.selectCellAtLocation(0,0); } diff --git a/apps/graph/graph/calculation_graph_controller.cpp b/apps/graph/graph/calculation_graph_controller.cpp index 0adcfc2d3..a68dc5156 100644 --- a/apps/graph/graph/calculation_graph_controller.cpp +++ b/apps/graph/graph/calculation_graph_controller.cpp @@ -19,6 +19,7 @@ CalculationGraphController::CalculationGraphController(Responder * parentRespond } void CalculationGraphController::viewWillAppear() { + Shared::SimpleInteractiveCurveViewController::viewWillAppear(); assert(!m_record.isNull()); Coordinate2D pointOfInterest = computeNewPointOfInterestFromAbscissa(m_graphRange->xMin(), 1); if (std::isnan(pointOfInterest.x1())) { diff --git a/apps/graph/graph/calculation_parameter_controller.cpp b/apps/graph/graph/calculation_parameter_controller.cpp index 050794c3e..93f98086f 100644 --- a/apps/graph/graph/calculation_parameter_controller.cpp +++ b/apps/graph/graph/calculation_parameter_controller.cpp @@ -33,6 +33,7 @@ View * CalculationParameterController::view() { } void CalculationParameterController::viewWillAppear() { + ViewController::viewWillAppear(); m_selectableTableView.reloadData(); } diff --git a/apps/graph/graph/curve_parameter_controller.cpp b/apps/graph/graph/curve_parameter_controller.cpp index 213f5ae51..f8fc1862b 100644 --- a/apps/graph/graph/curve_parameter_controller.cpp +++ b/apps/graph/graph/curve_parameter_controller.cpp @@ -77,6 +77,7 @@ int CurveParameterController::reusableCellCount() const { } void CurveParameterController::viewWillAppear() { + Shared::FunctionCurveParameterController::viewWillAppear(); m_selectableTableView.reloadData(); } diff --git a/apps/graph/graph/tangent_graph_controller.cpp b/apps/graph/graph/tangent_graph_controller.cpp index e6bb93a4d..f3cacdbcb 100644 --- a/apps/graph/graph/tangent_graph_controller.cpp +++ b/apps/graph/graph/tangent_graph_controller.cpp @@ -23,6 +23,7 @@ const char * TangentGraphController::title() { } void TangentGraphController::viewWillAppear() { + Shared::SimpleInteractiveCurveViewController::viewWillAppear(); m_graphRange->panToMakePointVisible(m_cursor->x(), m_cursor->y(), cursorTopMarginRatio(), k_cursorRightMarginRatio, cursorBottomMarginRatio(), k_cursorLeftMarginRatio); m_graphView->drawTangent(true); m_graphView->setOkView(nullptr); diff --git a/apps/graph/list/type_parameter_controller.cpp b/apps/graph/list/type_parameter_controller.cpp index 13a4ecb2e..f45e34176 100644 --- a/apps/graph/list/type_parameter_controller.cpp +++ b/apps/graph/list/type_parameter_controller.cpp @@ -42,6 +42,7 @@ const char * TypeParameterController::title() { } void TypeParameterController::viewWillAppear() { + ViewController::viewWillAppear(); App * myApp = App::app(); assert(!m_record.isNull()); Shared::ExpiringPointer function = myApp->functionStore()->modelForRecord(m_record); diff --git a/apps/probability/distribution_controller.cpp b/apps/probability/distribution_controller.cpp index 7c4d679b8..fd244bec6 100644 --- a/apps/probability/distribution_controller.cpp +++ b/apps/probability/distribution_controller.cpp @@ -72,6 +72,7 @@ DistributionController::DistributionController(Responder * parentResponder, Dist } void Probability::DistributionController::viewWillAppear() { + ViewController::viewWillAppear(); selectRow((int)m_distribution->type()); } diff --git a/apps/settings/main_controller.cpp b/apps/settings/main_controller.cpp index 4b076696e..0d3cdab3b 100644 --- a/apps/settings/main_controller.cpp +++ b/apps/settings/main_controller.cpp @@ -197,6 +197,7 @@ void MainController::willDisplayCellForIndex(HighlightCell * cell, int index) { } void MainController::viewWillAppear() { + ViewController::viewWillAppear(); m_selectableTableView.reloadData(); } diff --git a/apps/settings/sub_menu/generic_sub_controller.cpp b/apps/settings/sub_menu/generic_sub_controller.cpp index e1871cc3d..40f658955 100644 --- a/apps/settings/sub_menu/generic_sub_controller.cpp +++ b/apps/settings/sub_menu/generic_sub_controller.cpp @@ -27,6 +27,7 @@ void GenericSubController::didBecomeFirstResponder() { } void GenericSubController::viewWillAppear() { + ViewController::viewWillAppear(); /* This can't be done in didEnterResponderChain because we don't want it to * be done everytime the pop-up disappears. For example, if we are editing a * field and a pop-up shows up with a warning, we don't want to reload the diff --git a/apps/shared/float_parameter_controller.cpp b/apps/shared/float_parameter_controller.cpp index 97196a6f3..61fe12b92 100644 --- a/apps/shared/float_parameter_controller.cpp +++ b/apps/shared/float_parameter_controller.cpp @@ -34,6 +34,7 @@ void FloatParameterController::didBecomeFirstResponder() { template void FloatParameterController::viewWillAppear() { + ViewController::viewWillAppear(); if (selectedRow() == -1 || selectedRow() == numberOfRows()-1) { selectCellAtLocation(0, 0); } else { diff --git a/apps/shared/function_list_controller.cpp b/apps/shared/function_list_controller.cpp index 75e8b2102..50aa8832a 100644 --- a/apps/shared/function_list_controller.cpp +++ b/apps/shared/function_list_controller.cpp @@ -38,6 +38,7 @@ FunctionListController::FunctionListController(Responder * parentResponder, Butt /* TableViewDataSource */ void FunctionListController::viewWillAppear() { + ExpressionModelListController::viewWillAppear(); computeTitlesColumnWidth(); } diff --git a/apps/shared/interactive_curve_view_controller.cpp b/apps/shared/interactive_curve_view_controller.cpp index 5c09086c1..f1bc67391 100644 --- a/apps/shared/interactive_curve_view_controller.cpp +++ b/apps/shared/interactive_curve_view_controller.cpp @@ -133,6 +133,7 @@ Responder * InteractiveCurveViewController::defaultController() { } void InteractiveCurveViewController::viewWillAppear() { + SimpleInteractiveCurveViewController::viewWillAppear(); uint32_t newModelVersion = modelVersion(); if (*m_modelVersion != newModelVersion) { if (*m_modelVersion == 0 || numberOfCurves() == 1 || shouldSetDefaultOnModelChange()) { diff --git a/apps/shared/language_controller.cpp b/apps/shared/language_controller.cpp index 704e08562..dafda8c0d 100644 --- a/apps/shared/language_controller.cpp +++ b/apps/shared/language_controller.cpp @@ -35,6 +35,7 @@ void LanguageController::didBecomeFirstResponder() { } void LanguageController::viewWillAppear() { + ViewController::viewWillAppear(); resetSelection(); } diff --git a/apps/shared/sum_graph_controller.cpp b/apps/shared/sum_graph_controller.cpp index fe3aa001e..f7a72048a 100644 --- a/apps/shared/sum_graph_controller.cpp +++ b/apps/shared/sum_graph_controller.cpp @@ -26,6 +26,7 @@ SumGraphController::SumGraphController(Responder * parentResponder, InputEventHa } void SumGraphController::viewWillAppear() { + SimpleInteractiveCurveViewController::viewWillAppear(); m_graphRange->panToMakePointVisible(m_cursor->x(), m_cursor->y(), cursorTopMarginRatio(), k_cursorRightMarginRatio, cursorBottomMarginRatio(), k_cursorLeftMarginRatio); m_graphView->setBannerView(&m_legendView); m_graphView->setCursorView(&m_cursorView); diff --git a/apps/shared/tab_table_controller.cpp b/apps/shared/tab_table_controller.cpp index 30933ce98..38a4d1693 100644 --- a/apps/shared/tab_table_controller.cpp +++ b/apps/shared/tab_table_controller.cpp @@ -12,6 +12,7 @@ void TabTableController::didBecomeFirstResponder() { } void TabTableController::viewWillAppear() { + ViewController::viewWillAppear(); selectableTableView()->reloadData(); } diff --git a/apps/shared/zoom_parameter_controller.cpp b/apps/shared/zoom_parameter_controller.cpp index 22d053271..222a63732 100644 --- a/apps/shared/zoom_parameter_controller.cpp +++ b/apps/shared/zoom_parameter_controller.cpp @@ -55,6 +55,7 @@ bool ZoomParameterController::handleEvent(Ion::Events::Event event) { } void ZoomParameterController::viewWillAppear() { + ViewController::viewWillAppear(); m_contentView.curveView()->setOkView(nullptr); /* We need to change the curve range to keep the same visual aspect of the * view. */ diff --git a/apps/statistics/multiple_data_view_controller.cpp b/apps/statistics/multiple_data_view_controller.cpp index d21807be5..5aa4b3118 100644 --- a/apps/statistics/multiple_data_view_controller.cpp +++ b/apps/statistics/multiple_data_view_controller.cpp @@ -27,6 +27,7 @@ Responder * MultipleDataViewController::defaultController() { } void MultipleDataViewController::viewWillAppear() { + ViewController::viewWillAppear(); if (*m_selectedSeriesIndex < 0 || m_store->sumOfOccurrences(*m_selectedSeriesIndex) == 0) { *m_selectedSeriesIndex = multipleDataView()->seriesOfSubviewAtIndex(0); }