From c7ae89fcba3e70331ef9d0c4b9fa0f98d11b6f5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Thu, 21 Nov 2019 16:42:55 +0100 Subject: [PATCH] [calculation] Additional outputs: display left and center subviews of InputExactApproximateExpressionsView in the additional output pop-up --- .../additional_outputs/illustrated_list_controller.cpp | 6 +++++- .../scrollable_input_exact_approximate_expressions_cell.h | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/calculation/additional_outputs/illustrated_list_controller.cpp b/apps/calculation/additional_outputs/illustrated_list_controller.cpp index 81579eb0b..67e6d4c83 100644 --- a/apps/calculation/additional_outputs/illustrated_list_controller.cpp +++ b/apps/calculation/additional_outputs/illustrated_list_controller.cpp @@ -30,6 +30,7 @@ IllustratedListController::IllustratedListController(Responder * parentResponder { for (int i = 0; i < k_maxNumberOfAdditionalCalculations; i++) { m_additionalCalculationCells[i].setParentResponder(m_listController.selectableTableView()); + m_additionalCalculationCells[i].setDisplayLeft(true); } } @@ -83,8 +84,11 @@ void IllustratedListController::willDisplayCellForIndex(HighlightCell * cell, in // TODO ? return; } + Poincare::Context * context = App::app()->localContext(); ScrollableInputExactApproximateExpressionsCell * myCell = (ScrollableInputExactApproximateExpressionsCell *)cell; - myCell->setCalculation(m_calculationStore.calculationAtIndex(index-1).pointer()); + Calculation * c = m_calculationStore.calculationAtIndex(index-1).pointer(); + myCell->setCalculation(c); + myCell->setDisplayCenter(c->displayOutput(context) != Calculation::DisplayOutput::ApproximateOnly); //myCell->setHighlighted(myCell->isHighlighted()); //TODO?? } 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 9d37da239..70beec4de 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 @@ -37,6 +37,8 @@ public: ScrollableInputExactApproximateExpressionsCell() : m_view(nullptr) {} void setParentResponder(Responder * r) { m_view.setParentResponder(r); } void setCalculation(Calculation * calculation) { m_view.setCalculation(calculation); } + void setDisplayCenter(bool display) { m_view.setDisplayCenter(display); } + void setDisplayLeft(bool display) { m_view.setDisplayLeft(display); } private: int numberOfSubviews() const override { return 1; } View * subviewAtIndex(int index) override { return &m_view; }