UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-23 15:50:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

[calculation] Calculation: discard Calculation::toggleDisplayExact (this

Browse Source 
feature will be developed later)
This commit is contained in:
Émilie Feral
2019-04-26 09:50:25 +02:00
parent 1535d4dbb4
commit aebc5ce4d0
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/calculation/calculation.cpp
View File

@@ -20,8 +20,7 @@ Calculation::Calculation() :
m_approximateOutputText(),
m_height(-1),
m_selectedHeight(-1),
m_equalSign(EqualSign::Unknown),
m_toggleDisplayExact(false)
m_equalSign(EqualSign::Unknown)
{
}
@@ -66,10 +65,10 @@ KDCoordinate Calculation::height(Context * context, bool isSelected) {
DisplayOutput display = displayOutput(context);
Layout inputLayout = createInputLayout();
KDCoordinate inputHeight = inputLayout.layoutSize().height();
if (display == DisplayOutput::ExactOnly || (!isSelected && display == DisplayOutput::ExactAndApproximateToggle && m_toggleDisplayExact)) {
if (display == DisplayOutput::ExactOnly) {
KDCoordinate exactOutputHeight = createExactOutputLayout().layoutSize().height();
*memoizedHeight = inputHeight+exactOutputHeight;
} else if (display == DisplayOutput::ApproximateOnly || (!isSelected && display == DisplayOutput::ExactAndApproximateToggle && !m_toggleDisplayExact)) {
} else if (display == DisplayOutput::ApproximateOnly || (!isSelected && display == DisplayOutput::ExactAndApproximateToggle)) {
KDCoordinate approximateOutputHeight = createApproximateOutputLayout(context).layoutSize().height();
*memoizedHeight = inputHeight+approximateOutputHeight;
} else {