From 7ccaf3fc507bd1d308d639b2e5d5272cc391581b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9a=20Saviot?= <lea.saviot@numworks.com>
Date: Fri, 15 May 2020 14:16:10 +0200
Subject: [PATCH] [apps/calculation] Rename allExpressionsInline to
 forceSingleLine

---
 apps/calculation/calculation.cpp | 8 ++++----
 apps/calculation/calculation.h   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/calculation/calculation.cpp b/apps/calculation/calculation.cpp
index bf0e55518..b5da53efd 100644
--- a/apps/calculation/calculation.cpp
+++ b/apps/calculation/calculation.cpp
@@ -124,7 +124,7 @@ Layout Calculation::createApproximateOutputLayout(Context * context, bool * coul
   }
 }
 
-KDCoordinate Calculation::height(Context * context, bool expanded, bool allExpressionsInline) {
+KDCoordinate Calculation::height(Context * context, bool expanded, bool forceSingleLine) {
   KDCoordinate result = expanded ? m_expandedHeight : m_height;
   if (result >= 0) {
     // Height already computed
@@ -160,7 +160,7 @@ KDCoordinate Calculation::height(Context * context, bool expanded, bool allExpre
     KDCoordinate exactOutputHeight = exactLayout.layoutSize().height();
     KDCoordinate exactOutputWidth = exactLayout.layoutSize().width();
 
-    bool singleLine = allExpressionsInline || ((exactOutputWidth + inputWidth) < maxWidth - 2); //TODO LEA 2
+    bool singleLine = forceSingleLine || ((exactOutputWidth + inputWidth) < maxWidth - 2); //TODO LEA 2
 
     if (singleLine) {
       KDCoordinate exactOutputBaseline = exactLayout.baseline();
@@ -191,7 +191,7 @@ KDCoordinate Calculation::height(Context * context, bool expanded, bool allExpre
     KDCoordinate approximateOutputHeight = approximateLayout.layoutSize().height();
     KDCoordinate approximateOutputWidth = approximateLayout.layoutSize().width();
     if (displayOutput(context) == DisplayOutput::ApproximateOnly || (!expanded && displayOutput(context) == DisplayOutput::ExactAndApproximateToggle)) {
-      bool singleLine = allExpressionsInline || ((approximateOutputWidth + inputWidth) < maxWidth); // TODO LEA 2
+      bool singleLine = forceSingleLine || ((approximateOutputWidth + inputWidth) < maxWidth); // TODO LEA 2
       if (singleLine) {
         KDCoordinate approximateOutputBaseline = approximateLayout.baseline();
         result = std::max(inputBaseline, approximateOutputBaseline) + std::max(inputHeight - inputBaseline, approximateOutputHeight-approximateOutputBaseline) + singleMargin;
@@ -205,7 +205,7 @@ KDCoordinate Calculation::height(Context * context, bool expanded, bool allExpre
       KDCoordinate exactOutputWidth = exactLayout.layoutSize().width();
       KDCoordinate approximateOutputWidth = approximateLayout.layoutSize().width();
       KDCoordinate approximateOutputBaseline = approximateLayout.baseline();
-      bool singleLine = allExpressionsInline || ((inputWidth + exactOutputWidth + approximateOutputWidth) < (maxWidth - 30)); // the 30 represents the = sign (example: sin(30)) TODO LEA
+      bool singleLine = forceSingleLine || ((inputWidth + exactOutputWidth + approximateOutputWidth) < (maxWidth - 30)); // the 30 represents the = sign (example: sin(30)) TODO LEA
       if (singleLine) {
         result = std::max(inputBaseline, std::max(exactOutputBaseline, approximateOutputBaseline)) + std::max(inputHeight - inputBaseline, std::max(exactOutputHeight - exactOutputBaseline, approximateOutputHeight-approximateOutputBaseline)) + singleMargin;
       } else {
diff --git a/apps/calculation/calculation.h b/apps/calculation/calculation.h
index 203d56568..9746768a6 100644
--- a/apps/calculation/calculation.h
+++ b/apps/calculation/calculation.h
@@ -84,7 +84,7 @@ public:
   Poincare::Layout createApproximateOutputLayout(Poincare::Context * context, bool * couldNotCreateApproximateLayout);
 
   // Memoization of height
-  KDCoordinate height(Poincare::Context * context, bool expanded = false, bool allExpressionsInline = false);
+  KDCoordinate height(Poincare::Context * context, bool expanded = false, bool forceSingleLine = false);
 
   // Displayed output
   DisplayOutput displayOutput(Poincare::Context * context);