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

[apps] Calculation: change the grey of approximate output

Browse Source 
Change-Id: Iac001fc581544af0634ad1d7765074f69aa07809
This commit is contained in:
Émilie Feral
2017-11-23 11:49:52 +01:00
parent 7f0c54e6e1
commit a5c984fce3
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/calculation/output_expressions_view.cpp
View File

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

1
escher/include/escher/palette.h
View File

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

1
escher/src/palette.cpp
View File

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