UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-18 16:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Omega theme: some fixes

Browse Source
This commit is contained in:
Quentin Guidée
2019-11-29 23:35:35 +01:00
parent fda0a4e6d0
commit ec43f41a8e
11 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/probability/distribution_curve_view.h
View File

@@ -30,7 +30,7 @@ protected:
private:
static float EvaluateAtAbscissa(float abscissa, void * model, void * context);
static Poincare::Coordinate2D<float> EvaluateXYAtAbscissa(float abscissa, void * model, void * context);
static constexpr KDColor k_backgroundColor = Palette::WallScreen;
static constexpr KDColor k_backgroundColor = Palette::BackgroundApps;
void drawStandardNormal(KDContext * ctx, KDRect rect, float colorLowerBound, float colorUpperBound) const;
char m_labels[k_maxNumberOfXLabels][k_labelBufferMaxSize];
Distribution * m_distribution;

2
apps/regression/calculation_controller.cpp
View File

@@ -28,7 +28,7 @@ CalculationController::CalculationController(Responder * parentResponder, Button
{
m_r2Layout = HorizontalLayout::Builder(CodePointLayout::Builder('r', KDFont::SmallFont), VerticalOffsetLayout::Builder(CodePointLayout::Builder('2', KDFont::SmallFont), VerticalOffsetLayoutNode::Position::Superscript));
m_selectableTableView.setVerticalCellOverlap(0);
m_selectableTableView.setBackgroundColor(Palette::WallScreenDark);
m_selectableTableView.setBackgroundColor(Palette::BackgroundAppsSecondary);
m_selectableTableView.setMargins(k_margin, k_scrollBarMargin, k_scrollBarMargin, k_margin);
m_r2TitleCell.setAlignment(1.0f, 0.5f);
for (int i = 0; i < Store::k_numberOfSeries; i++) {

2
apps/settings/sub_menu/message_table_cell_with_editable_text_with_separator.cpp
View File

@@ -15,7 +15,7 @@ void MessageTableCellWithEditableTextWithSeparator::setHighlighted(bool highligh
void MessageTableCellWithEditableTextWithSeparator::drawRect(KDContext * ctx, KDRect rect) const {
ctx->fillRect(KDRect(0, 0, bounds().width(), k_separatorThickness), Palette::GreyBright);
ctx->fillRect(KDRect(0, k_separatorThickness, bounds().width(), k_margin-k_separatorThickness), Palette::WallScreen);
ctx->fillRect(KDRect(0, k_separatorThickness, bounds().width(), k_margin-k_separatorThickness), Palette::BackgroundApps);
}
int MessageTableCellWithEditableTextWithSeparator::numberOfSubviews() const {

2
apps/shared/hideable.h
View File

@@ -10,7 +10,7 @@ public:
Hideable() :
m_hide(false)
{}
static KDColor hideColor() { return Palette::WallScreenDark; }
static KDColor hideColor() { return Palette::BackgroundAppsSecondary; }
bool hidden() const { return m_hide; }
virtual void setHide(bool hide) { m_hide = hide; }
virtual void reinit() {}

2
apps/shared/store_controller.cpp
View File

@@ -18,7 +18,7 @@ StoreController::ContentView::ContentView(DoublePairStore * store, Responder * p
m_formulaInputView(this, inputEventHandlerDelegate, textFieldDelegate),
m_displayFormulaInputView(false)
{
m_dataView.setBackgroundColor(Palette::WallScreenDark);
m_dataView.setBackgroundColor(Palette::BackgroundAppsSecondary);
m_dataView.setVerticalCellOverlap(0);
m_dataView.setMargins(k_margin, k_scrollBarMargin, k_scrollBarMargin, k_margin);
}

2
apps/shared/values_controller.cpp
View File

@@ -27,7 +27,7 @@ ValuesController::ValuesController(Responder * parentResponder, ButtonRowControl
void ValuesController::setupSelectableTableViewAndCells(InputEventHandlerDelegate * inputEventHandlerDelegate) {
selectableTableView()->setVerticalCellOverlap(0);
selectableTableView()->setMargins(k_margin, k_scrollBarMargin, k_scrollBarMargin, k_margin);
selectableTableView()->setBackgroundColor(Palette::WallScreenDark);
selectableTableView()->setBackgroundColor(Palette::BackgroundAppsSecondary);
int numberOfAbscissaCells = abscissaCellsCount();
for (int i = 0; i < numberOfAbscissaCells; i++) {

10
apps/solver/solutions_controller.cpp
View File

@@ -18,18 +18,20 @@ namespace Solver {
static inline KDCoordinate maxCoordinate(KDCoordinate x, KDCoordinate y) { return x > y ? x : y; }
SolutionsController::ContentView::ContentView(SolutionsController * controller) :
m_warningMessageView0(KDFont::SmallFont, I18n::Message::Default, 0.5f, 0.5f, Palette::PrimaryText, Palette::WallScreenDark),
m_warningMessageView1(KDFont::SmallFont, I18n::Message::Default, 0.5f, 0.5f, Palette::PrimaryText, Palette::WallScreenDark),
m_warningMessageView0(KDFont::SmallFont, I18n::Message::Default, 0.5f, 0.5f, Palette::PrimaryText, Palette::BackgroundAppsSecondary),
m_warningMessageView1(KDFont::SmallFont, I18n::Message::Default, 0.5f, 0.5f, Palette::PrimaryText, Palette::BackgroundAppsSecondary),
m_selectableTableView(controller),
m_displayWarningMoreSolutions(false)
{
m_selectableTableView.setBackgroundColor(Palette::WallScreenDark);
m_selectableTableView.setBackgroundColor(Palette::BackgroundAppsSecondary
);
m_selectableTableView.setVerticalCellOverlap(0);
}
void SolutionsController::ContentView::drawRect(KDContext * ctx, KDRect rect) const {
if (m_displayWarningMoreSolutions) {
ctx->fillRect(KDRect(0, 0, bounds().width(), k_topMargin), Palette::WallScreenDark);
ctx->fillRect(KDRect(0, 0, bounds().width(), k_topMargin), Palette::BackgroundAppsSecondary
);
}
}

2
apps/statistics/calculation_controller.cpp
View File

@@ -19,7 +19,7 @@ CalculationController::CalculationController(Responder * parentResponder, Button
m_hideableCell(),
m_store(store)
{
m_selectableTableView.setBackgroundColor(Palette::WallScreenDark);
m_selectableTableView.setBackgroundColor(Palette::BackgroundAppsSecondary);
m_selectableTableView.setVerticalCellOverlap(0);
m_selectableTableView.setMargins(k_margin, k_scrollBarMargin, k_scrollBarMargin, k_margin);
for (int i = 0; i < k_numberOfSeriesTitleCells; i++) {

4
apps/variable_box_empty_controller.cpp
View File

@@ -7,12 +7,12 @@ using namespace Poincare;
using namespace Ion;
VariableBoxEmptyController::VariableBoxEmptyView::VariableBoxEmptyView() :
m_layoutExample(0.5f, 0.5f, Palette::PrimaryText, Palette::WallScreen)
m_layoutExample(0.5f, 0.5f, Palette::PrimaryText, Palette::BackgroundApps)
{
for (int i = 0; i < k_numberOfMessages; i++) {
m_messages[i].setFont(k_font);
m_messages[i].setAlignment(0.5f, 0.5f);
m_messages[i].setBackgroundColor(Palette::WallScreen);
m_messages[i].setBackgroundColor(Palette::BackgroundApps);
}
m_messages[0].setAlignment(0.5f,1.0f);
m_messages[k_numberOfMessages-1].setAlignment(0.5f,0.0f);

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

@@ -12,6 +12,7 @@ public:
constexpr static KDColor AccentText = KDColor::RGB24(0x00857f);
constexpr static KDColor BackgroundHard = KDColor::RGB24(0xffffff);
constexpr static KDColor BackgroundApps = KDColor::RGB24(0xfafafa);
constexpr static KDColor BackgroundAppsSecondary = KDColor::RGB24(0xf0f0f0);
constexpr static KDColor Toolbar = KDColor::RGB24(0xc03535);
constexpr static KDColor ToolbarText = KDColor::RGB24(0xffffff);
constexpr static KDColor ExpressionInputBackground = KDColor::RGB24(0xe0e0e0);

13
escher/src/palette.cpp
View File

@@ -5,6 +5,7 @@ constexpr KDColor Palette::SecondaryText; // =GREYDARK
constexpr KDColor Palette::AccentText;
constexpr KDColor Palette::BackgroundHard;
constexpr KDColor Palette::BackgroundApps;
constexpr KDColor Palette::BackgroundAppsSecondary;
constexpr KDColor Palette::Toolbar;
constexpr KDColor Palette::ToolbarText;
constexpr KDColor Palette::ExpressionInputBackground;
@@ -90,12 +91,12 @@ 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;
constexpr KDColor Palette::WallScreenDark;
constexpr KDColor Palette::SubTab;
constexpr KDColor Palette::LowBattery;
constexpr KDColor Palette::Select; // Done
constexpr KDColor Palette::SelectDark; // Done
constexpr KDColor Palette::WallScreen; // Done
constexpr KDColor Palette::WallScreenDark; // Done
constexpr KDColor Palette::SubTab; // Done
constexpr KDColor Palette::LowBattery; // Done
constexpr KDColor Palette::Red;
constexpr KDColor Palette::RedLight;
constexpr KDColor Palette::Magenta;