UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps/calc] Fix display glitch when doing 1.2->a (cell not high enough)

Browse Source
This commit is contained in:
Léa Saviot
2018-11-13 16:28:47 +01:00
committed by Émilie Feral
parent 36e19f3122
commit 5d6db930fd
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/calculation/calculation.cpp
View File

@@ -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;
}