From 5d6db930fd4f49ae5ec9b82df7d838bb3b579dc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Tue, 13 Nov 2018 16:28:47 +0100 Subject: [PATCH] [apps/calc] Fix display glitch when doing 1.2->a (cell not high enough) --- apps/calculation/calculation.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/apps/calculation/calculation.cpp b/apps/calculation/calculation.cpp index fce2d023d..6a1833c92 100644 --- a/apps/calculation/calculation.cpp +++ b/apps/calculation/calculation.cpp @@ -54,12 +54,12 @@ KDCoordinate Calculation::height(Context * context) { KDCoordinate inputHeight = inputLayout.layoutSize().height(); Layout approximateLayout = createApproximateOutputLayout(context); Layout exactLayout = createExactOutputLayout(); - if (shouldOnlyDisplayApproximateOutput(context)) { - KDCoordinate approximateOutputHeight = approximateLayout.layoutSize().height(); - m_height = inputHeight+approximateOutputHeight; - } else if (shouldOnlyDisplayExactOutput()) { + if (shouldOnlyDisplayExactOutput()) { KDCoordinate exactOutputHeight = exactLayout.layoutSize().height(); m_height = inputHeight+exactOutputHeight; + } else if (shouldOnlyDisplayApproximateOutput(context)) { + KDCoordinate approximateOutputHeight = approximateLayout.layoutSize().height(); + m_height = inputHeight+approximateOutputHeight; } else { KDCoordinate approximateOutputHeight = approximateLayout.layoutSize().height(); KDCoordinate exactOutputHeight = exactLayout.layoutSize().height(); @@ -138,6 +138,9 @@ Layout Calculation::createApproximateOutputLayout(Context * context) { } bool Calculation::shouldOnlyDisplayApproximateOutput(Context * context) { + if (shouldOnlyDisplayExactOutput()) { + return false; + } if (strcmp(m_exactOutputText, m_approximateOutputText) == 0) { return true; }