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

[escher/scroll_view] Uniformize scroll bars frame across Epsilon

Browse Source
This commit is contained in:
Ruben Dashyan
2019-02-14 17:21:28 +01:00
committed by EmilieNumworks
parent 15de9f93ef
commit 571967088e
6 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/home/controller.cpp
View File

@@ -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<ScrollView::BarDecorator *>(m_selectableTableView.decorator())->setBarsFrameBreadth(k_scrollBarsFrameBreadth);
static_cast<ScrollView::BarDecorator *>(m_selectableTableView.decorator())->verticalBar()->setMargin(k_indicatorMargin);
}

1
apps/home/controller.h
View File

@@ -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;

1
apps/shared/storage_values_controller.cpp
View File

@@ -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<ScrollView::BarDecorator *>(m_selectableTableView.decorator())->setBarsFrameBreadth(13);
m_abscissaTitleCell.setMessageFont(k_font);
for (int i = 0; i < k_maxNumberOfAbscissaCells; i++) {
m_abscissaCells[i].setParentResponder(&m_selectableTableView);

1
apps/shared/values_controller.cpp
View File

@@ -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<ScrollView::BarDecorator *>(m_selectableTableView.decorator())->setBarsFrameBreadth(13);
m_abscissaTitleCell.setMessageFont(KDFont::SmallFont);
for (int i = 0; i < k_maxNumberOfAbscissaCells; i++) {
m_abscissaCells[i].setParentResponder(&m_selectableTableView);

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

@@ -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 {

7
escher/src/scroll_view.cpp
View File

@@ -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()