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

[poincare] Fix calculation height allocation failure handling

Browse Source
This commit is contained in:
Léa Saviot
2018-07-30 15:36:45 +02:00
parent d5c76108bf
commit 5a5f2403da
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/calculation/calculation.cpp
View File

@@ -72,17 +72,29 @@ KDCoordinate Calculation::height(Context * context) {
LayoutRef inputLayout = createInputLayout();
if (inputLayout.isAllocationFailure()) {
/* If there is not enough tree pool space to create the layout, return a
* default height. Do not store it in m_height in case some memory get
* default height. Do not store it in m_height in case some memory gets
* freed afterwards. */
return k_heightComputationFailureHeight;
}
KDCoordinate inputHeight = inputLayout.layoutSize().height();
LayoutRef approximateLayout = createApproximateOutputLayout(context);
if (approximateLayout.isAllocationFailure()) {
/* If there is not enough tree pool space to create the layout, return a
* default height. Do not store it in m_height in case some memory gets
* freed afterwards. */
return k_heightComputationFailureHeight;
}
KDCoordinate approximateOutputHeight = approximateLayout.layoutSize().height();
if (shouldOnlyDisplayApproximateOutput(context)) {
m_height = inputHeight+approximateOutputHeight;
} else {
LayoutRef exactLayout = createExactOutputLayout(context);
if (exactLayout.isAllocationFailure()) {
/* If there is not enough tree pool space to create the layout, return a
* default height. Do not store it in m_height in case some memory gets
* freed afterwards. */
return k_heightComputationFailureHeight;
}
KDCoordinate exactOutputHeight = exactLayout.layoutSize().height();
KDCoordinate outputHeight = max(exactLayout.baseline(), approximateLayout.baseline()) + max(exactOutputHeight-exactLayout.baseline(), approximateOutputHeight-approximateLayout.baseline());
m_height = inputHeight + outputHeight;