From 272d405eb7efd5e076ee8e271b279d67ac9db490 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Thu, 9 Jan 2020 15:54:01 +0100 Subject: [PATCH] [apps/calculation] additional_outputs: Always force selection on the left subviews of cells when IllustratedListController pop-up is displayed --- .../additional_outputs/illustrated_list_controller.cpp | 4 ++++ .../scrollable_input_exact_approximate_expressions_cell.h | 1 + 2 files changed, 5 insertions(+) diff --git a/apps/calculation/additional_outputs/illustrated_list_controller.cpp b/apps/calculation/additional_outputs/illustrated_list_controller.cpp index 167eda662..e907c6649 100644 --- a/apps/calculation/additional_outputs/illustrated_list_controller.cpp +++ b/apps/calculation/additional_outputs/illustrated_list_controller.cpp @@ -19,6 +19,10 @@ IllustratedListController::IllustratedListController(Responder * parentResponder } void IllustratedListController::didEnterResponderChain(Responder * previousFirstResponder) { + // Select the left subview on all cells + for (int i = 0; i < k_maxNumberOfAdditionalCalculations; i++) { + m_additionalCalculationCells[i].setSelectedSubviewPosition(ScrollableInputExactApproximateExpressionsView::SubviewPosition::Left); + } selectCellAtLocation(0, 1); } diff --git a/apps/calculation/additional_outputs/scrollable_input_exact_approximate_expressions_cell.h b/apps/calculation/additional_outputs/scrollable_input_exact_approximate_expressions_cell.h index 2d71008aa..a408d1bfc 100644 --- a/apps/calculation/additional_outputs/scrollable_input_exact_approximate_expressions_cell.h +++ b/apps/calculation/additional_outputs/scrollable_input_exact_approximate_expressions_cell.h @@ -58,6 +58,7 @@ public: void setCalculation(Calculation * calculation); void setDisplayCenter(bool display); void setDisplayLeft(bool display); + void setSelectedSubviewPosition(ScrollableInputExactApproximateExpressionsView::SubviewPosition subviewPosition) { m_view.setSelectedSubviewPosition(subviewPosition); } private: // Remove label margin added by TableCell because they're already handled by ScrollableInputExactApproximateExpressionsView