From 9de231ba64b83f61ffa1722d435aff17ef01f092 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Quentin=20Guid=C3=A9e?= Date: Sun, 16 Feb 2020 13:14:41 +0100 Subject: [PATCH] [WIP] Fix settings --- apps/probability/distribution_controller.h | 2 +- apps/settings/sub_menu/selectable_view_with_messages.cpp | 4 ++-- apps/shared/scrollable_multiple_expressions_view.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/probability/distribution_controller.h b/apps/probability/distribution_controller.h index 349a3519c..766d6a65b 100644 --- a/apps/probability/distribution_controller.h +++ b/apps/probability/distribution_controller.h @@ -25,7 +25,7 @@ private: class ContentView : public View { public: ContentView(SelectableTableView * selectableTableView) : - m_titleView(KDFont::SmallFont, I18n::Message::ChooseDistribution, 0.5f, 0.5f, Palette::GreyDark, Palette::WallScreen), + m_titleView(KDFont::SmallFont, I18n::Message::ChooseDistribution, 0.5f, 0.5f, Palette::GreyDark, Palette::BackgroundApps), m_selectableTableView(selectableTableView) {} constexpr static KDCoordinate k_titleMargin = 8; diff --git a/apps/settings/sub_menu/selectable_view_with_messages.cpp b/apps/settings/sub_menu/selectable_view_with_messages.cpp index a42248873..5bef3ecc9 100644 --- a/apps/settings/sub_menu/selectable_view_with_messages.cpp +++ b/apps/settings/sub_menu/selectable_view_with_messages.cpp @@ -15,12 +15,12 @@ SelectableViewWithMessages::SelectableViewWithMessages(SelectableTableView * sel for (int i = 0; i < k_maxNumberOfLines; i++) { m_messageLines[i].setFont(KDFont::SmallFont); m_messageLines[i].setAlignment(0.5f, 0.5f); - m_messageLines[i].setBackgroundColor(Palette::WallScreen); + m_messageLines[i].setBackgroundColor(Palette::BackgroundApps); } } void SelectableViewWithMessages::drawRect(KDContext * ctx, KDRect rect) const { - ctx->fillRect(bounds(), Palette::WallScreen); + ctx->fillRect(bounds(), Palette::BackgroundApps); } void SelectableViewWithMessages::setMessages(I18n::Message * m, int numberOfMessages) { diff --git a/apps/shared/scrollable_multiple_expressions_view.cpp b/apps/shared/scrollable_multiple_expressions_view.cpp index f61000837..2c8c0af57 100644 --- a/apps/shared/scrollable_multiple_expressions_view.cpp +++ b/apps/shared/scrollable_multiple_expressions_view.cpp @@ -17,7 +17,7 @@ AbstractScrollableMultipleExpressionsView::ContentCell::ContentCell() : } KDColor AbstractScrollableMultipleExpressionsView::ContentCell::backgroundColor() const { - KDColor background = m_even ? KDColorWhite : Palette::WallScreen; + KDColor background = m_even ? KDColorWhite : Palette::BackgroundApps; return background; }