diff --git a/apps/home/controller.cpp b/apps/home/controller.cpp index f1b7bcefc..10f0075a5 100644 --- a/apps/home/controller.cpp +++ b/apps/home/controller.cpp @@ -12,7 +12,6 @@ Controller::ContentView::ContentView(Controller * controller, SelectableTableVie m_selectableTableView.setVerticalCellOverlap(0); m_selectableTableView.setMargins(0, k_sideMargin, k_bottomMargin, k_sideMargin); m_selectableTableView.setBackgroundColor(KDColorWhite); - static_cast(m_selectableTableView.decorator())->setBarsFrameBreadth(k_scrollBarsFrameBreadth); static_cast(m_selectableTableView.decorator())->verticalBar()->setMargin(k_indicatorMargin); } diff --git a/apps/home/controller.h b/apps/home/controller.h index 679651b1a..ae3be69e5 100644 --- a/apps/home/controller.h +++ b/apps/home/controller.h @@ -43,7 +43,6 @@ private: AppsContainer * m_container; static constexpr KDCoordinate k_sideMargin = 4; static constexpr KDCoordinate k_bottomMargin = 14; - static constexpr KDCoordinate k_scrollBarsFrameBreadth = 15; static constexpr KDCoordinate k_indicatorMargin = 61; static constexpr int k_numberOfColumns = 3; static constexpr int k_maxNumberOfCells = 16; diff --git a/apps/shared/storage_values_controller.cpp b/apps/shared/storage_values_controller.cpp index cadc74dd4..d8946031d 100644 --- a/apps/shared/storage_values_controller.cpp +++ b/apps/shared/storage_values_controller.cpp @@ -32,7 +32,6 @@ StorageValuesController::StorageValuesController(Responder * parentResponder, In m_selectableTableView.setBottomMargin(k_bottomMargin); m_selectableTableView.setLeftMargin(k_leftMargin); m_selectableTableView.setBackgroundColor(Palette::WallScreenDark); - static_cast(m_selectableTableView.decorator())->setBarsFrameBreadth(13); m_abscissaTitleCell.setMessageFont(k_font); for (int i = 0; i < k_maxNumberOfAbscissaCells; i++) { m_abscissaCells[i].setParentResponder(&m_selectableTableView); diff --git a/apps/shared/values_controller.cpp b/apps/shared/values_controller.cpp index d19e77dd6..5d8091cb9 100644 --- a/apps/shared/values_controller.cpp +++ b/apps/shared/values_controller.cpp @@ -32,7 +32,6 @@ ValuesController::ValuesController(Responder * parentResponder, InputEventHandle m_selectableTableView.setBottomMargin(k_bottomMargin); m_selectableTableView.setLeftMargin(k_leftMargin); m_selectableTableView.setBackgroundColor(Palette::WallScreenDark); - static_cast(m_selectableTableView.decorator())->setBarsFrameBreadth(13); m_abscissaTitleCell.setMessageFont(KDFont::SmallFont); for (int i = 0; i < k_maxNumberOfAbscissaCells; i++) { m_abscissaCells[i].setParentResponder(&m_selectableTableView); diff --git a/escher/include/escher/scroll_view.h b/escher/include/escher/scroll_view.h index 8fd79e7d6..78cc1c70d 100644 --- a/escher/include/escher/scroll_view.h +++ b/escher/include/escher/scroll_view.h @@ -50,11 +50,10 @@ public: KDRect layoutIndicators(KDSize content, KDPoint offset, KDRect frame) override; ScrollViewVerticalBar * verticalBar() { return &m_verticalBar; } ScrollViewHorizontalBar * horizontalBar() { return &m_horizontalBar; } - void setBarsFrameBreadth(KDCoordinate t) { m_barsFrameBreadth = t; } private: ScrollViewVerticalBar m_verticalBar; ScrollViewHorizontalBar m_horizontalBar; - KDCoordinate m_barsFrameBreadth; + static constexpr KDCoordinate k_barsFrameBreadth = 13; }; class ArrowDecorator : public Decorator { diff --git a/escher/src/scroll_view.cpp b/escher/src/scroll_view.cpp index 832ac6f4c..681273fdc 100644 --- a/escher/src/scroll_view.cpp +++ b/escher/src/scroll_view.cpp @@ -125,8 +125,7 @@ void ScrollView::InnerView::drawRect(KDContext * ctx, KDRect rect) const { ScrollView::BarDecorator::BarDecorator() : m_verticalBar(), - m_horizontalBar(), - m_barsFrameBreadth(20) + m_horizontalBar() { } @@ -141,12 +140,12 @@ View * ScrollView::BarDecorator::indicatorAtIndex(int index) { } KDRect ScrollView::BarDecorator::layoutIndicators(KDSize content, KDPoint offset, KDRect frame) { - KDCoordinate hBarFrameBreadth = m_barsFrameBreadth * m_horizontalBar.update( + KDCoordinate hBarFrameBreadth = k_barsFrameBreadth * m_horizontalBar.update( content.width(), offset.x(), frame.width() ); - KDCoordinate vBarFrameBreadth = m_barsFrameBreadth * m_verticalBar.update( + KDCoordinate vBarFrameBreadth = k_barsFrameBreadth * m_verticalBar.update( content.height(), offset.y(), frame.height()