UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-18 16:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

[escher/scroll_view] Rename m_indicatorThickness to m_barsFrameBreadth

Browse Source
This commit is contained in:
Ruben Dashyan
2019-01-24 11:47:53 +01:00
committed by EmilieNumworks
parent 81f80ef602
commit 1e958717fb
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/home/controller.cpp
View File

@@ -12,7 +12,7 @@ Controller::ContentView::ContentView(Controller * controller, SelectableTableVie
m_selectableTableView.setVerticalCellOverlap(0); m_selectableTableView.setVerticalCellOverlap(0);
m_selectableTableView.setMargins(0, k_sideMargin, k_bottomMargin, k_sideMargin); m_selectableTableView.setMargins(0, k_sideMargin, k_bottomMargin, k_sideMargin);
m_selectableTableView.setColorsBackground(false); m_selectableTableView.setColorsBackground(false);
m_selectableTableView.decorator()->setIndicatorThickness(k_indicatorThickness); m_selectableTableView.decorator()->setBarsFrameBreadth(k_scrollBarsFrameBreadth);
m_selectableTableView.decorator()->verticalBar()->setMargin(k_indicatorMargin); m_selectableTableView.decorator()->verticalBar()->setMargin(k_indicatorMargin);
} }

2
apps/home/controller.h
View File

@@ -43,7 +43,7 @@ private:
AppsContainer * m_container; AppsContainer * m_container;
static constexpr KDCoordinate k_sideMargin = 4; static constexpr KDCoordinate k_sideMargin = 4;
static constexpr KDCoordinate k_bottomMargin = 14; static constexpr KDCoordinate k_bottomMargin = 14;
static constexpr KDCoordinate k_indicatorThickness = 15; static constexpr KDCoordinate k_scrollBarsFrameBreadth = 15;
static constexpr KDCoordinate k_indicatorMargin = 61; static constexpr KDCoordinate k_indicatorMargin = 61;
static constexpr int k_numberOfColumns = 3; static constexpr int k_numberOfColumns = 3;
static constexpr int k_maxNumberOfCells = 16; static constexpr int k_maxNumberOfCells = 16;

2
apps/shared/storage_values_controller.cpp
View File

@@ -32,7 +32,7 @@ StorageValuesController::StorageValuesController(Responder * parentResponder, In
m_selectableTableView.setBottomMargin(k_bottomMargin); m_selectableTableView.setBottomMargin(k_bottomMargin);
m_selectableTableView.setLeftMargin(k_leftMargin); m_selectableTableView.setLeftMargin(k_leftMargin);
m_selectableTableView.setBackgroundColor(Palette::WallScreenDark); m_selectableTableView.setBackgroundColor(Palette::WallScreenDark);
m_selectableTableView.decorator()->setIndicatorThickness(13); m_selectableTableView.decorator()->setBarsFrameBreadth(13);
m_abscissaTitleCell.setMessageFont(k_font); m_abscissaTitleCell.setMessageFont(k_font);
for (int i = 0; i < k_maxNumberOfAbscissaCells; i++) { for (int i = 0; i < k_maxNumberOfAbscissaCells; i++) {
m_abscissaCells[i].setParentResponder(&m_selectableTableView); m_abscissaCells[i].setParentResponder(&m_selectableTableView);

2
apps/shared/values_controller.cpp
View File

@@ -32,7 +32,7 @@ ValuesController::ValuesController(Responder * parentResponder, InputEventHandle
m_selectableTableView.setBottomMargin(k_bottomMargin); m_selectableTableView.setBottomMargin(k_bottomMargin);
m_selectableTableView.setLeftMargin(k_leftMargin); m_selectableTableView.setLeftMargin(k_leftMargin);
m_selectableTableView.setBackgroundColor(Palette::WallScreenDark); m_selectableTableView.setBackgroundColor(Palette::WallScreenDark);
m_selectableTableView.decorator()->setIndicatorThickness(13); m_selectableTableView.decorator()->setBarsFrameBreadth(13);
m_abscissaTitleCell.setMessageFont(KDFont::SmallFont); m_abscissaTitleCell.setMessageFont(KDFont::SmallFont);
for (int i = 0; i < k_maxNumberOfAbscissaCells; i++) { for (int i = 0; i < k_maxNumberOfAbscissaCells; i++) {
m_abscissaCells[i].setParentResponder(&m_selectableTableView); m_abscissaCells[i].setParentResponder(&m_selectableTableView);

4
escher/include/escher/scroll_view.h
View File

@@ -36,11 +36,11 @@ public:
void layoutIndicators(KDSize content, KDPoint offset, KDSize frame); void layoutIndicators(KDSize content, KDPoint offset, KDSize frame);
ScrollViewVerticalBar * verticalBar() { return &m_verticalBar; } ScrollViewVerticalBar * verticalBar() { return &m_verticalBar; }
ScrollViewHorizontalBar * horizontalBar() { return &m_horizontalBar; } ScrollViewHorizontalBar * horizontalBar() { return &m_horizontalBar; }
void setIndicatorThickness(KDCoordinate t) { m_indicatorThickness = t; } void setBarsFrameBreadth(KDCoordinate t) { m_barsFrameBreadth = t; }
private: private:
ScrollViewVerticalBar m_verticalBar; ScrollViewVerticalBar m_verticalBar;
ScrollViewHorizontalBar m_horizontalBar; ScrollViewHorizontalBar m_horizontalBar;
KDCoordinate m_indicatorThickness; KDCoordinate m_barsFrameBreadth;
}; };
Decorator * decorator() { return &m_decorator; } Decorator * decorator() { return &m_decorator; }

6
escher/src/scroll_view.cpp
View File

@@ -148,17 +148,17 @@ KDCoordinate ScrollView::maxContentHeightDisplayableWithoutScrolling() {
ScrollView::Decorator::Decorator() : ScrollView::Decorator::Decorator() :
m_verticalBar(), m_verticalBar(),
m_horizontalBar(), m_horizontalBar(),
m_indicatorThickness(20) m_barsFrameBreadth(20)
{ {
} }
void ScrollView::Decorator::layoutIndicators(KDSize content, KDPoint offset, KDSize frame) { void ScrollView::Decorator::layoutIndicators(KDSize content, KDPoint offset, KDSize frame) {
KDCoordinate hBarFrameBreadth = m_indicatorThickness * m_horizontalBar.update( KDCoordinate hBarFrameBreadth = m_barsFrameBreadth * m_horizontalBar.update(
content.width(), content.width(),
offset.x(), offset.x(),
frame.width() frame.width()
); );
KDCoordinate vBarFrameBreadth = m_indicatorThickness * m_verticalBar.update( KDCoordinate vBarFrameBreadth = m_barsFrameBreadth * m_verticalBar.update(
content.height(), content.height(),
offset.y(), offset.y(),
frame.height() frame.height()