From a5c984fce33a5c49f97d9520790d2f648a78c026 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Thu, 23 Nov 2017 11:49:52 +0100 Subject: [PATCH] [apps] Calculation: change the grey of approximate output Change-Id: Iac001fc581544af0634ad1d7765074f69aa07809 --- apps/calculation/output_expressions_view.cpp | 4 ++-- escher/include/escher/palette.h | 1 + escher/src/palette.cpp | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/calculation/output_expressions_view.cpp b/apps/calculation/output_expressions_view.cpp index e7fd721af..43caefc23 100644 --- a/apps/calculation/output_expressions_view.cpp +++ b/apps/calculation/output_expressions_view.cpp @@ -9,7 +9,7 @@ namespace Calculation { OutputExpressionsView::OutputExpressionsView(Responder * parentResponder) : Responder(parentResponder), m_approximateExpressionView(), - m_approximateSign(KDText::FontSize::Large, I18n::Message::AlmostEqual, 0.5f, 0.5f, Palette::GreyDark), + m_approximateSign(KDText::FontSize::Large, I18n::Message::AlmostEqual, 0.5f, 0.5f, Palette::GreyVeryDark), m_exactExpressionView(), m_selectedSubviewType(OutputExpressionsView::SubviewType::ExactOutput) { @@ -46,7 +46,7 @@ void OutputExpressionsView::reloadCell() { if (numberOfSubviews() == 1) { m_approximateExpressionView.setTextColor(KDColorBlack); } else { - m_approximateExpressionView.setTextColor(Palette::GreyDark); + m_approximateExpressionView.setTextColor(Palette::GreyVeryDark); } layoutSubviews(); } diff --git a/escher/include/escher/palette.h b/escher/include/escher/palette.h index 5b6230678..ad47ce19d 100644 --- a/escher/include/escher/palette.h +++ b/escher/include/escher/palette.h @@ -13,6 +13,7 @@ public: constexpr static KDColor GreyBright = KDColor::RGB24(0xececec); constexpr static KDColor GreyMiddle = KDColor::RGB24(0xd9d9d9); constexpr static KDColor GreyDark = KDColor::RGB24(0xa7a7a7); + constexpr static KDColor GreyVeryDark = KDColor::RGB24(0x8c8c8c); constexpr static KDColor Select = KDColor::RGB24(0xd4d7e0); constexpr static KDColor SelectDark = KDColor::RGB24(0xb0b8d8); constexpr static KDColor WallScreen = KDColor::RGB24(0xf7f9fa); diff --git a/escher/src/palette.cpp b/escher/src/palette.cpp index 0602d3ca7..59da5fbb7 100644 --- a/escher/src/palette.cpp +++ b/escher/src/palette.cpp @@ -8,6 +8,7 @@ constexpr KDColor Palette::GreyWhite; constexpr KDColor Palette::GreyBright; constexpr KDColor Palette::GreyMiddle; constexpr KDColor Palette::GreyDark; +constexpr KDColor Palette::GreyVeryDark; constexpr KDColor Palette::Select; constexpr KDColor Palette::SelectDark; constexpr KDColor Palette::WallScreen;