From f7913fb744498c83e31956ad90c48f046c6ca9d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Thu, 8 Nov 2018 14:39:31 +0100 Subject: [PATCH] [apps/calc] Fix history cell output copy --- apps/calculation/history_controller.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/apps/calculation/history_controller.cpp b/apps/calculation/history_controller.cpp index d86c63f85..bdd3f90cb 100644 --- a/apps/calculation/history_controller.cpp +++ b/apps/calculation/history_controller.cpp @@ -53,11 +53,13 @@ bool HistoryController::handleEvent(Ion::Events::Event event) { if (subviewType == HistoryViewCell::SubviewType::Input) { editController->insertTextBody(calculation->inputText()); } else { - ScrollableExactApproximateExpressionsView::SubviewType outputSubviewType = selectedCell->outputView()->selectedSubviewType(); - if (outputSubviewType == ScrollableExactApproximateExpressionsView::SubviewType::ExactOutput) { - editController->insertTextBody(calculation->exactOutputText()); - } else { + ScrollableExactApproximateExpressionsView::SubviewPosition outputSubviewPosition = selectedCell->outputView()->selectedSubviewPosition(); + if (outputSubviewPosition == ScrollableExactApproximateExpressionsView::SubviewPosition::Right + && !calculation->shouldOnlyDisplayExactOutput()) + { editController->insertTextBody(calculation->approximateOutputText()); + } else { + editController->insertTextBody(calculation->exactOutputText()); } } return true;