From 7bbd106cf9643bd320d48c6f8bf4ab6d8acdbf83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Thu, 26 Jan 2017 09:44:32 +0100 Subject: [PATCH] [escher] Improve scroller indicator colors Change-Id: Idc8adadf48cdafe213c71ebf24a40b1f4528e365 --- escher/include/escher/scroll_view.h | 2 +- escher/include/escher/selectable_table_view.h | 4 ++-- escher/include/escher/table_view.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/escher/include/escher/scroll_view.h b/escher/include/escher/scroll_view.h index a00a1f329..0889e704a 100644 --- a/escher/include/escher/scroll_view.h +++ b/escher/include/escher/scroll_view.h @@ -10,7 +10,7 @@ public: ScrollView(View * contentView, KDCoordinate topMargin = 0, KDCoordinate rightMargin = 0, KDCoordinate bottomMargin = 0, KDCoordinate leftMargin = 0, bool showIndicators = true, bool colorBackground = true, KDColor backgroundColor = Palette::WallScreen, KDCoordinate indicatorThickness = 10, - KDColor indicatorColor = Palette::GreyMiddle, KDColor backgroundIndicatorColor = Palette::GreyWhite, + KDColor indicatorColor = Palette::GreyDark, KDColor backgroundIndicatorColor = Palette::GreyMiddle, KDCoordinate indicatorMargin = 14); void setContentOffset(KDPoint offset); diff --git a/escher/include/escher/selectable_table_view.h b/escher/include/escher/selectable_table_view.h index 6f9425ceb..5201243f7 100644 --- a/escher/include/escher/selectable_table_view.h +++ b/escher/include/escher/selectable_table_view.h @@ -20,8 +20,8 @@ public: KDCoordinate topMargin = 0, KDCoordinate rightMargin = 0, KDCoordinate bottomMargin = 0, KDCoordinate leftMargin = 0, SelectableTableViewDelegate * delegate = nullptr, bool showIndicators = true, bool colorBackground = true, KDColor backgroundColor = Palette::WallScreen, - KDCoordinate indicatorThickness = 10, KDColor indicatorColor = Palette::GreyMiddle, - KDColor backgroundIndicatorColor = Palette::GreyWhite, KDCoordinate indicatorMargin = 14); + KDCoordinate indicatorThickness = 10, KDColor indicatorColor = Palette::GreyDark, + KDColor backgroundIndicatorColor = Palette::GreyMiddle, KDCoordinate indicatorMargin = 14); int selectedRow(); int selectedColumn(); diff --git a/escher/include/escher/table_view.h b/escher/include/escher/table_view.h index 152a6428f..66d8c96ec 100644 --- a/escher/include/escher/table_view.h +++ b/escher/include/escher/table_view.h @@ -11,8 +11,8 @@ public: TableView(TableViewDataSource * dataSource, KDCoordinate topMargin = 0, KDCoordinate rightMargin = 0, KDCoordinate bottomMargin = 0, KDCoordinate leftMargin = 0, bool showIndicators = true, bool colorBackground = true, KDColor backgroundColor = Palette::WallScreen, - KDCoordinate indicatorThickness = 10, KDColor indicatorColor = Palette::GreyMiddle, - KDColor backgroundIndicatorColor = Palette::GreyWhite, KDCoordinate indicatorMargin = 14); + KDCoordinate indicatorThickness = 10, KDColor indicatorColor = Palette::GreyDark, + KDColor backgroundIndicatorColor = Palette::GreyMiddle, KDCoordinate indicatorMargin = 14); virtual void scrollToCell(int i, int j); TableViewCell * cellAtLocation(int i, int j);