From f94727b62d8e75792f35e19de44dc34a342d6480 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Mon, 23 Dec 2019 18:36:15 +0100 Subject: [PATCH] [calculation] HistoryController: factorize code --- apps/calculation/history_controller.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/apps/calculation/history_controller.cpp b/apps/calculation/history_controller.cpp index 27bf09321..ac8f7240c 100644 --- a/apps/calculation/history_controller.cpp +++ b/apps/calculation/history_controller.cpp @@ -70,20 +70,18 @@ bool HistoryController::handleEvent(Ion::Events::Event event) { ScrollableExactApproximateExpressionsView::SubviewPosition outputSubviewPosition = selectedCell->outputView()->selectedSubviewPosition(); if (outputSubviewPosition == ScrollableExactApproximateExpressionsView::SubviewPosition::Left) { Expression::AdditionalInformationType additionalInfoType = selectedCell->additionalInformationType(); - ViewController * vc = nullptr; + ListController * vc = nullptr; /* TODO * Faire un parent commun à tous les controllers qui sait faire setExpression */ if (additionalInfoType == Expression::AdditionalInformationType::Complex) { - m_complexController.setExpression(calculation->input()); vc = &m_complexController; } else if (additionalInfoType == Expression::AdditionalInformationType::Trigonometry) { - m_trigonometryController.setExpression(calculation->input()); vc = &m_trigonometryController; } else if (additionalInfoType == Expression::AdditionalInformationType::Integer) { - m_integerController.setExpression(calculation->input()); vc = &m_integerController; } if (vc) { + vc->setExpression(calculation->input()); Container::activeApp()->displayModalViewController(vc, 0.f, 0.f, Metric::CommonTopMargin, Metric::PopUpLeftMargin, 0, Metric::PopUpRightMargin); } } else {