UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-18 16:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps/calculation] Remove unused variable

Browse Source
This commit is contained in:
Léa Saviot
2020-05-26 11:52:44 +02:00
committed by EmilieNumworks
parent c4908c2bd9
commit e2f4b30b84
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
apps/calculation/calculation.cpp
View File

@@ -135,23 +135,21 @@ KDCoordinate Calculation::height(Context * context, KDCoordinate topBottomMargin
return result; return result;
} }
// Get input height // Get input information
Layout inputLayout = createInputLayout(); Layout inputLayout = createInputLayout();
KDCoordinate inputHeight = inputLayout.layoutSize().height(); KDCoordinate inputHeight = inputLayout.layoutSize().height();
KDCoordinate inputWidth = inputLayout.layoutSize().width(); KDCoordinate inputWidth = inputLayout.layoutSize().width();
KDCoordinate inputBaseline = inputLayout.baseline(); KDCoordinate inputBaseline = inputLayout.baseline();
// Get output height // Get output information
KDCoordinate outputWidth; KDCoordinate outputWidth;
KDCoordinate outputBaseline; KDCoordinate outputBaseline;
KDCoordinate outputHeightBelowBaseline; KDCoordinate outputHeightBelowBaseline;
DisplayOutput displayType = displayOutput(context); DisplayOutput displayType = displayOutput(context);
/* If the display output is ExactAndApproximateToggle, we want to use the /* If the display output is ExactAndApproximateToggle, we want to use the
* expanded width to compute if the calculaton is in single line or not. */ * expanded width to compute if the calculaton is in single line or not. */
bool shouldComputeMaxOutputWidthForSingleLine = !forceSingleLine && (!expanded && displayType == DisplayOutput::ExactAndApproximateToggle); bool shouldComputeMaxOutputWidthForSingleLine = !forceSingleLine && (!expanded && displayType == DisplayOutput::ExactAndApproximateToggle);
KDCoordinate maxOutputWidth = -1;
{ {
bool displaysExactOnly = displayType == DisplayOutput::ExactOnly; bool displaysExactOnly = displayType == DisplayOutput::ExactOnly;
@@ -174,6 +172,8 @@ KDCoordinate Calculation::height(Context * context, KDCoordinate topBottomMargin
forceDisplayOutput(displayType); forceDisplayOutput(displayType);
displaysExactOnly = false; displaysExactOnly = false;
displayApproximateOnly = true; displayApproximateOnly = true;
shouldComputeMaxOutputWidthForSingleLine = false;
outputWidth = 0;
} else { } else {
/* We should only display the exact result, but we cannot create it /* We should only display the exact result, but we cannot create it
* -> raise an exception. */ * -> raise an exception. */
@@ -181,7 +181,7 @@ KDCoordinate Calculation::height(Context * context, KDCoordinate topBottomMargin
} }
} else { } else {
KDSize exactSize = exactLayout.layoutSize(); KDSize exactSize = exactLayout.layoutSize();
maxOutputWidth = exactSize.width(); outputWidth = exactSize.width();
if (displaysExact) { if (displaysExact) {
exactOutputWidth = exactSize.width(); exactOutputWidth = exactSize.width();
exactOutputBaseline = exactLayout.baseline(); exactOutputBaseline = exactLayout.baseline();
@@ -203,7 +203,7 @@ KDCoordinate Calculation::height(Context * context, KDCoordinate topBottomMargin
Poincare::ExceptionCheckpoint::Raise(); Poincare::ExceptionCheckpoint::Raise();
} }
KDSize approximateOutputSize = approximateLayout.layoutSize(); KDSize approximateOutputSize = approximateLayout.layoutSize();
maxOutputWidth += approximateOutputSize.width(); outputWidth += approximateOutputSize.width();
if (displaysApproximate) { if (displaysApproximate) {
approximateOutputWidth = approximateOutputSize.width(); approximateOutputWidth = approximateOutputSize.width();
approximateOutputBaseline = approximateLayout.baseline(); approximateOutputBaseline = approximateLayout.baseline();
@@ -212,15 +212,14 @@ KDCoordinate Calculation::height(Context * context, KDCoordinate topBottomMargin
} }
// Compute the output info // Compute the output info
maxOutputWidth += AbstractScrollableMultipleExpressionsView::StandardApproximateViewAndMarginsSize(); if (shouldComputeMaxOutputWidthForSingleLine || (exactOutputWidth > 0 && approximateOutputWidth > 0)) {
outputWidth = exactOutputWidth outputWidth += AbstractScrollableMultipleExpressionsView::StandardApproximateViewAndMarginsSize();
+ ((exactOutputWidth > 0 && approximateOutputWidth > 0) ? AbstractScrollableMultipleExpressionsView::StandardApproximateViewAndMarginsSize() : 0) }
+ approximateOutputWidth;
outputBaseline = std::max(exactOutputBaseline, approximateOutputBaseline); outputBaseline = std::max(exactOutputBaseline, approximateOutputBaseline);
outputHeightBelowBaseline = std::max(exactOutputBelowBaseline, approximateOutputBelowBaseline); outputHeightBelowBaseline = std::max(exactOutputBelowBaseline, approximateOutputBelowBaseline);
} }
if (forceSingleLine || canBeSingleLine(inputWidth, maxOutputWidth)) { if (forceSingleLine || canBeSingleLine(inputWidth, outputWidth)) {
result = std::max(inputBaseline, outputBaseline) // Above the baseline result = std::max(inputBaseline, outputBaseline) // Above the baseline
+ std::max(static_cast<KDCoordinate>(inputHeight - inputBaseline), outputHeightBelowBaseline) // Below the baseline + std::max(static_cast<KDCoordinate>(inputHeight - inputBaseline), outputHeightBelowBaseline) // Below the baseline
+ 2 * verticalMarginAroundLayouts; + 2 * verticalMarginAroundLayouts;