diff --git a/apps/calculation/additional_outputs/illustrated_list_controller.h b/apps/calculation/additional_outputs/illustrated_list_controller.h index 716577c57..8311f1f76 100644 --- a/apps/calculation/additional_outputs/illustrated_list_controller.h +++ b/apps/calculation/additional_outputs/illustrated_list_controller.h @@ -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; diff --git a/apps/calculation/additional_outputs/scrollable_input_exact_approximate_expressions_cell.h b/apps/calculation/additional_outputs/scrollable_input_exact_approximate_expressions_cell.h index 8434af517..9d37da239 100644 --- a/apps/calculation/additional_outputs/scrollable_input_exact_approximate_expressions_cell.h +++ b/apps/calculation/additional_outputs/scrollable_input_exact_approximate_expressions_cell.h @@ -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; }; diff --git a/apps/calculation/history_controller.cpp b/apps/calculation/history_controller.cpp index 262697f08..ee557c3db 100644 --- a/apps/calculation/history_controller.cpp +++ b/apps/calculation/history_controller.cpp @@ -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();