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

[calculation] Improve margins of additional results pop-up

Browse Source
This commit is contained in:
Émilie Feral
2019-11-21 15:01:46 +01:00
committed by Léa Saviot
parent 2ebbe5ae25
commit eac83fce0b
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/calculation/additional_outputs/illustrated_list_controller.h
View File

@@ -39,7 +39,7 @@ private:
SelectableTableView m_selectableTableView;
};
constexpr static int k_maxNumberOfAdditionalCalculations = 3;
constexpr static KDCoordinate k_illustrationHeight = 50;
constexpr static KDCoordinate k_illustrationHeight = 100;
ListController m_listController;
// Cells
virtual HighlightCell * illustrationCell() = 0;

2
apps/calculation/additional_outputs/scrollable_input_exact_approximate_expressions_cell.h
View File

@@ -22,7 +22,7 @@ private:
ExpressionView * leftExpressionView() { return &m_leftExpressionView; }
private:
void setLeftViewBackgroundColor(KDColor color) override { m_leftExpressionView.setBackgroundColor(color); }
KDCoordinate leftBaseline() const override { return m_leftExpressionView.layout().isUninitialized() ? m_leftExpressionView.layout().baseline() : 0; }
KDCoordinate leftBaseline() const override { return !m_leftExpressionView.layout().isUninitialized() ? m_leftExpressionView.layout().baseline() : 0; }
KDSize leftMinimalSizeForOptimalDisplay() const override { return m_leftExpressionView.minimalSizeForOptimalDisplay(); }
ExpressionView m_leftExpressionView;
};

2
apps/calculation/history_controller.cpp
View File

@@ -75,7 +75,7 @@ bool HistoryController::handleEvent(Ion::Events::Event event) {
* m_controller->setType(additionalInformationType)*/
if (additionalInfoType == Expression::AdditionalInformationType::Complex) {
m_complexController.fillCalculationStoreFromExpression(calculation->exactOutput());
Container::activeApp()->displayModalViewController(&m_complexController, 0.f, 0.f, Metric::PopUpTopMargin, Metric::PopUpLeftMargin, Metric::PopUpTopMargin, Metric::PopUpRightMargin);
Container::activeApp()->displayModalViewController(&m_complexController, 0.f, 0.f, Metric::CommonTopMargin, Metric::PopUpLeftMargin, 0, Metric::PopUpRightMargin);
}
} else {
m_selectableTableView.deselectTable();