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

New fixes for the themes

Browse Source
This commit is contained in:
Quentin Guidée
2019-11-30 13:31:01 +01:00
parent ec43f41a8e
commit 2c49b8f5c9
4 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/graph/graph/graph_view.cpp
View File

@@ -59,7 +59,7 @@ void GraphView::drawRect(KDContext * ctx, KDRect rect) const {
drawCartesianCurve(ctx, rect, -INFINITY, INFINITY, [](float t, void * model, void * context) {
float * tangent = (float *)model;
return Poincare::Coordinate2D<float>(t, tangent[0]*t+tangent[1]);
}, tangentParameter, nullptr, Palette::GreyVeryDark);
}, tangentParameter, nullptr, Palette::GraphTangent);
}
continue;
}

4
apps/shared/scrollable_exact_approximate_expressions_view.cpp
View File

@@ -9,7 +9,7 @@ static inline KDCoordinate maxCoordinate(KDCoordinate x, KDCoordinate y) { retur
ScrollableExactApproximateExpressionsView::ContentCell::ContentCell() :
m_rightExpressionView(),
m_approximateSign(KDFont::LargeFont, I18n::Message::AlmostEqual, 0.5f, 0.5f, Palette::GreyVeryDark),
m_approximateSign(KDFont::LargeFont, I18n::Message::AlmostEqual, 0.5f, 0.5f, Palette::ApproximateSignText),
m_leftExpressionView(),
m_selectedSubviewPosition((SubviewPosition)0),
m_displayLeftExpression(true)
@@ -47,7 +47,7 @@ void ScrollableExactApproximateExpressionsView::ContentCell::reloadTextColor() {
if (numberOfSubviews() == 1) {
m_rightExpressionView.setTextColor(Palette::PrimaryText);
} else {
m_rightExpressionView.setTextColor(Palette::GreyVeryDark);
m_rightExpressionView.setTextColor(Palette::ApproximateExpressionText);
}
}

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

@@ -19,6 +19,8 @@ public:
constexpr static KDColor Battery = KDColor::RGB24(0xffffff);
constexpr static KDColor BatteryInCharge = KDColor::RGB24(0x179e1f);
constexpr static KDColor BatteryLow = KDColor::RGB24(0x992321);
constexpr static KDColor ApproximateSignText = KDColor::RGB24(0x595959);
constexpr static KDColor ApproximateExpressionText = KDColor::RGB24(0x595959);
// Controls (switches, gauge, arrows...)
constexpr static KDColor Control = KDColor::RGB24(0x00857f);
@@ -48,6 +50,9 @@ public:
constexpr static KDColor StatisticsBox = KDColor::RGB24(0x00857f);
constexpr static KDColor StatisticsSelect = KDColor::RGB24(0xe0e0e0);
// Graph
constexpr static KDColor GraphTangent = KDColor::RGB24(0x595959);
// SubMenus
constexpr static KDColor SubMenuBackground = KDColor::RGB24(0xe0e0e0);
constexpr static KDColor SubMenuBorder = KDColor::RGB24(0xfafafa);

8
escher/src/palette.cpp
View File

@@ -12,6 +12,8 @@ constexpr KDColor Palette::ExpressionInputBackground;
constexpr KDColor Palette::Battery;
constexpr KDColor Palette::BatteryInCharge;
constexpr KDColor Palette::BatteryLow;
constexpr KDColor Palette::ApproximateSignText;
constexpr KDColor Palette::ApproximateExpressionText;
constexpr KDColor Palette::Control;
constexpr KDColor Palette::ControlEnabled;
@@ -35,6 +37,8 @@ constexpr KDColor Palette::ProbabilityCurve;
constexpr KDColor Palette::StatisticsBox;
constexpr KDColor Palette::GraphTangent;
constexpr KDColor Palette::SubMenuBackground;
constexpr KDColor Palette::SubMenuBorder;
constexpr KDColor Palette::SubMenuText;
@@ -89,8 +93,8 @@ constexpr KDColor Palette::PurpleDark; // DONE
constexpr KDColor Palette::GreyWhite;
constexpr KDColor Palette::GreyBright;
constexpr KDColor Palette::GreyMiddle;
constexpr KDColor Palette::GreyDark;
constexpr KDColor Palette::GreyVeryDark;
constexpr KDColor Palette::GreyDark; // Done
constexpr KDColor Palette::GreyVeryDark; // Done
constexpr KDColor Palette::Select; // Done
constexpr KDColor Palette::SelectDark; // Done
constexpr KDColor Palette::WallScreen; // Done