diff --git a/apps/regression/calculation_controller.cpp b/apps/regression/calculation_controller.cpp index a8a9bed6c..1f389766d 100644 --- a/apps/regression/calculation_controller.cpp +++ b/apps/regression/calculation_controller.cpp @@ -266,7 +266,7 @@ View * CalculationController::loadView() { SelectableTableView * tableView = new SelectableTableView(this, this, this, this); tableView->setVerticalCellOverlap(0); tableView->setBackgroundColor(Palette::WallScreenDark); -; + tableView->setMargins(k_margin, k_scrollBarMargin, k_scrollBarMargin, k_margin); m_r2TitleCell = new EvenOddExpressionCellWithMargin(1.0f, 0.5f); for (int i = 0; i < Store::k_numberOfSeries; i++) { m_columnTitleCells[i] = new ColumnTitleCell(tableView); diff --git a/apps/regression/calculation_controller.h b/apps/regression/calculation_controller.h index cb97a5c20..3b581be69 100644 --- a/apps/regression/calculation_controller.h +++ b/apps/regression/calculation_controller.h @@ -42,9 +42,6 @@ public: int reusableCellCount(int type) override; int typeAtLocation(int i, int j) override; private: - Responder * tabController() const override; - View * loadView() override; - void unloadView(View * view) override; constexpr static int k_totalNumberOfRows = 14; constexpr static int k_maxNumberOfDisplayableRows = 11; constexpr static int k_totalNumberOfDoubleBufferRows = 5; @@ -60,6 +57,12 @@ private: static constexpr KDCoordinate k_cellHeight = 25; static constexpr KDCoordinate k_cellWidth = Ion::Display::Width/2 - Metric::CommonRightMargin/2 - Metric::CommonLeftMargin/2; + static constexpr KDCoordinate k_margin = 8; + static constexpr KDCoordinate k_scrollBarMargin = Metric::CommonRightMargin; + + Responder * tabController() const override; + View * loadView() override; + void unloadView(View * view) override; Shared::MarginEvenOddMessageTextCell * m_titleCells[k_maxNumberOfDisplayableRows]; EvenOddExpressionCellWithMargin * m_r2TitleCell; Poincare::ExpressionLayout * m_r2Layout;