From 7988f836570d90c9effa87438d5a5d77df2624d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Fri, 1 Jun 2018 16:42:02 +0200 Subject: [PATCH] [solver] Improve cell layouts in solutions controller --- apps/solver/solutions_controller.cpp | 2 +- apps/solver/solutions_controller.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/solver/solutions_controller.cpp b/apps/solver/solutions_controller.cpp index 5fd06c3fc..6d66e9e64 100644 --- a/apps/solver/solutions_controller.cpp +++ b/apps/solver/solutions_controller.cpp @@ -134,7 +134,7 @@ KDCoordinate SolutionsController::rowHeight(int j) { KDCoordinate exactLayoutHeight = exactLayout->size().height(); KDCoordinate approximateLayoutHeight = approximateLayout->size().height(); KDCoordinate layoutHeight = max(exactLayout->baseline(), approximateLayout->baseline()) + max(exactLayoutHeight-exactLayout->baseline(), approximateLayoutHeight-approximateLayout->baseline()); - return layoutHeight+k_defaultCellHeight; + return layoutHeight+ScrollableExactApproximateExpressionsCell::k_margin*2; } KDCoordinate SolutionsController::cumulatedHeightFromIndex(int j) { diff --git a/apps/solver/solutions_controller.h b/apps/solver/solutions_controller.h index a1365d052..23d045e1b 100644 --- a/apps/solver/solutions_controller.h +++ b/apps/solver/solutions_controller.h @@ -35,8 +35,8 @@ public: /* Responder */ void didBecomeFirstResponder() override; private: - constexpr static int k_symbolCellWidth = 100; - constexpr static int k_valueCellWidth = 180; + constexpr static int k_symbolCellWidth = 90; + constexpr static int k_valueCellWidth = 190; constexpr static KDCoordinate k_defaultCellHeight = 20; EquationStore * m_equationStore; EvenOddBufferTextCell m_symbolCells[EquationStore::k_maxNumberOfSolutions];