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

Omega theme finished

Browse Source
This commit is contained in:
Quentin Guidée
2019-11-30 22:59:33 +01:00
parent 62695f50d7
commit 058e0552fa
18 changed files with 67 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/probability/calculation_cell.cpp
View File

@@ -43,7 +43,7 @@ void CalculationCell::drawRect(KDContext * ctx, KDRect rect) const {
ctx->fillRect(bounds(), Palette::BackgroundHard);
if (m_isResponder) {
KDSize textSize = m_text.minimalSizeForOptimalDisplay();
ctx->strokeRect(KDRect(2*k_margin+textSize.width(), 0, calculationCellWidth()+2*ResponderImageCell::k_outline, ImageCell::k_height+2*ResponderImageCell::k_outline), Palette::GreyMiddle);
ctx->strokeRect(KDRect(2*k_margin+textSize.width(), 0, calculationCellWidth()+2*ResponderImageCell::k_outline, ImageCell::k_height+2*ResponderImageCell::k_outline), Palette::ProbabilityCellBorder);
}
}

8
apps/probability/cell.cpp
View File

@@ -59,10 +59,10 @@ void Cell::drawRect(KDContext * ctx, KDRect rect) const {
KDCoordinate height = bounds().height();
KDColor backgroundColor = isHighlighted() ? Palette::ListCellBackgroundSelected : Palette::ListCellBackground;
ctx->fillRect(KDRect(1, 1, width-2, height-1), backgroundColor);
ctx->fillRect(KDRect(0, 0, width, 1), Palette::GreyBright);
ctx->fillRect(KDRect(0, 1, 1, height-1), Palette::GreyBright);
ctx->fillRect(KDRect(width-1, 1, 1, height-1), Palette::GreyBright);
ctx->fillRect(KDRect(0, height-1, width, 1), Palette::GreyBright);
ctx->fillRect(KDRect(0, 0, width, 1), Palette::ProbabilityCellBorder);
ctx->fillRect(KDRect(0, 1, 1, height-1), Palette::ProbabilityCellBorder);
ctx->fillRect(KDRect(width-1, 1, 1, height-1), Palette::ProbabilityCellBorder);
ctx->fillRect(KDRect(0, height-1, width, 1), Palette::ProbabilityCellBorder);
}
}

2
apps/probability/distribution_curve_view.cpp
View File

@@ -31,7 +31,7 @@ void DistributionCurveView::drawRect(KDContext * ctx, KDRect rect) const {
if (m_distribution->isContinuous()) {
drawCartesianCurve(ctx, rect, -INFINITY, INFINITY, EvaluateXYAtAbscissa, m_distribution, nullptr, Palette::ProbabilityCurve, true, lowerBound, upperBound);
} else {
drawHistogram(ctx, rect, EvaluateAtAbscissa, m_distribution, nullptr, 0, 1, false, Palette::GreyMiddle, Palette::ProbabilityCurve, lowerBound, upperBound+0.5f);
drawHistogram(ctx, rect, EvaluateAtAbscissa, m_distribution, nullptr, 0, 1, false, Palette::ProbabilityHistogramBar, Palette::ProbabilityCurve, lowerBound, upperBound+0.5f);
}
}

2
apps/probability/responder_image_cell.cpp
View File

@@ -12,7 +12,7 @@ ResponderImageCell::ResponderImageCell(Responder * parentResponder, Distribution
void ResponderImageCell::drawRect(KDContext * ctx, KDRect rect) const {
ctx->fillRect(bounds(), Palette::BackgroundHard);
ctx->strokeRect(KDRect(0, 0, ImageCell::k_width+2*k_outline, ImageCell::k_height+2*k_outline), Palette::GreyMiddle);
ctx->strokeRect(KDRect(0, 0, ImageCell::k_width+2*k_outline, ImageCell::k_height+2*k_outline), Palette::ProbabilityCellBorder);
}
KDSize ResponderImageCell::minimalSizeForOptimalDisplay() const {

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

@@ -14,7 +14,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, 0, bounds().width(), k_separatorThickness), Palette::ListCellBorder);
ctx->fillRect(KDRect(0, k_separatorThickness, bounds().width(), k_margin-k_separatorThickness), Palette::BackgroundApps);
}

2
apps/shared/banner_view.h
View File

@@ -13,7 +13,7 @@ public:
void reload() { layoutSubviews(); }
static constexpr const KDFont * Font() { return KDFont::SmallFont; }
static constexpr KDColor TextColor() { return Palette::PrimaryText; }
static constexpr KDColor BackgroundColor() { return Palette::GreyMiddle; }
static constexpr KDColor BackgroundColor() { return Palette::SubMenuBackground; }
private:
static constexpr KDCoordinate LineSpacing = 2;
int numberOfSubviews() const override = 0;

2
apps/shared/buffer_text_view_with_text_field.cpp
View File

@@ -35,7 +35,7 @@ void BufferTextViewWithTextField::drawRect(KDContext * ctx, KDRect rect) const {
// Draw the text field border
KDRect borderRect = KDRect(textFieldRect.x()-k_borderWidth, textFieldRect.y()-k_borderWidth, textFieldRect.width()+2*k_borderWidth, textFieldRect.height()+2*k_borderWidth);
ctx->strokeRect(borderRect, Palette::GreyMiddle);
ctx->strokeRect(borderRect, Palette::ListCellBorder);
}
void BufferTextViewWithTextField::didBecomeFirstResponder() {

2
apps/shared/button_with_separator.cpp
View File

@@ -14,7 +14,7 @@ void ButtonWithSeparator::drawRect(KDContext * ctx, KDRect rect) const {
ctx->fillRect(KDRect(0, k_margin, width, k_lineThickness), Palette::ListCellBorder);
ctx->fillRect(KDRect(0, k_margin+k_lineThickness, k_lineThickness, height-k_margin), Palette::ListCellBorder);
ctx->fillRect(KDRect(width-k_lineThickness, k_lineThickness+k_margin, k_lineThickness, height-k_margin), Palette::ListCellBorder);
ctx->fillRect(KDRect(0, height-3*k_lineThickness, width, k_lineThickness), Palette::GreyWhite);
ctx->fillRect(KDRect(0, height-3*k_lineThickness, width, k_lineThickness), Palette::ButtonBorderOut);
ctx->fillRect(KDRect(0, height-2*k_lineThickness, width, k_lineThickness), Palette::ListCellBorder);
ctx->fillRect(KDRect(k_lineThickness, height-k_lineThickness, width-2*k_lineThickness, k_lineThickness), Palette::ButtonShadow);
}

4
apps/shared/curve_view.cpp
View File

@@ -437,8 +437,8 @@ void CurveView::drawDot(KDContext * ctx, KDRect rect, float x, float y, KDColor
}
void CurveView::drawGrid(KDContext * ctx, KDRect rect) const {
KDColor boldColor = Palette::GreyMiddle;
KDColor lightColor = Palette::GreyWhite;
KDColor boldColor = Palette::GridPrimaryLine;
KDColor lightColor = Palette::GridSecondaryLine;
drawGridLines(ctx, rect, Axis::Vertical, m_curveViewRange->xGridUnit(), boldColor, lightColor);
drawGridLines(ctx, rect, Axis::Horizontal, m_curveViewRange->yGridUnit(), boldColor, lightColor);
}

8
apps/shared/sum_graph_controller.cpp
View File

@@ -155,17 +155,17 @@ void SumGraphController::reloadBannerView() {
/* Legend View */
SumGraphController::LegendView::LegendView(SumGraphController * controller, InputEventHandlerDelegate * inputEventHandlerDelegate, CodePoint sumSymbol) :
m_sum(0.0f, 0.5f, Palette::PrimaryText, Palette::GreyMiddle),
m_sum(0.0f, 0.5f, Palette::PrimaryText, Palette::SubMenuBackground),
m_sumLayout(),
m_legend(k_font, I18n::Message::Default, 0.0f, 0.5f, Palette::PrimaryText, Palette::GreyMiddle),
m_editableZone(controller, m_textBuffer, k_editableZoneBufferSize, TextField::maxBufferSize(), inputEventHandlerDelegate, controller, k_font, 0.0f, 0.5f, Palette::PrimaryText, Palette::GreyMiddle),
m_legend(k_font, I18n::Message::Default, 0.0f, 0.5f, Palette::PrimaryText, Palette::SubMenuBackground),
m_editableZone(controller, m_textBuffer, k_editableZoneBufferSize, TextField::maxBufferSize(), inputEventHandlerDelegate, controller, k_font, 0.0f, 0.5f, Palette::PrimaryText, Palette::SubMenuBackground),
m_sumSymbol(sumSymbol)
{
m_textBuffer[0] = 0;
}
void SumGraphController::LegendView::drawRect(KDContext * ctx, KDRect rect) const {
ctx->fillRect(bounds(), Palette::GreyMiddle);
ctx->fillRect(bounds(), Palette::SubMenuBackground);
}
KDSize SumGraphController::LegendView::minimalSizeForOptimalDisplay() const {

4
apps/shared/zoom_parameter_controller.cpp
View File

@@ -121,7 +121,7 @@ ZoomParameterController::ContentView::LegendView::LegendView()
for (int i = 0; i < k_numberOfLegends; i++) {
m_legends[i].setFont(KDFont::SmallFont);
m_legends[i].setMessage(messages[i]);
m_legends[i].setBackgroundColor(Palette::GreyBright);
m_legends[i].setBackgroundColor(Palette::SubMenuBackground);
m_legends[i].setAlignment(horizontalAlignments[i], 0.5f);
}
KeyView::Type tokenTypes[k_numberOfTokens] = {KeyView::Type::Up, KeyView::Type::Down, KeyView::Type::Left, KeyView::Type::Right, KeyView::Type::Plus, KeyView::Type::Minus};
@@ -131,7 +131,7 @@ ZoomParameterController::ContentView::LegendView::LegendView()
}
void ZoomParameterController::ContentView::LegendView::drawRect(KDContext * ctx, KDRect rect) const {
ctx->fillRect(KDRect(0, bounds().height() - k_legendHeight, bounds().width(), k_legendHeight), Palette::GreyBright);
ctx->fillRect(KDRect(0, bounds().height() - k_legendHeight, bounds().width(), k_legendHeight), Palette::SubMenuBackground);
}
int ZoomParameterController::ContentView::LegendView::numberOfSubviews() const {

4
apps/statistics/box_view.cpp
View File

@@ -63,7 +63,7 @@ void BoxView::drawRect(KDContext * ctx, KDRect rect) const {
double thirdQuart = m_store->thirdQuartile(m_series);
double maxVal = m_store->maxValue(m_series);
KDColor boxColor = isMainViewSelected() ? m_selectedHistogramLightColor : Palette::GreyWhite;
KDColor boxColor = isMainViewSelected() ? m_selectedHistogramLightColor : Palette::StatisticsNotSelected;
// Draw the main box
KDCoordinate firstQuartilePixels = std::round(floatToPixel(Axis::Horizontal, firstQuart));
KDCoordinate thirdQuartilePixels = std::round(floatToPixel(Axis::Horizontal, thirdQuart));
@@ -83,7 +83,7 @@ void BoxView::drawRect(KDContext * ctx, KDRect rect) const {
* lines. This solution could hide the highlighted line by coloring the next
* quantile if it has the same value. */
for (int k = 0; k < 5; k++) {
drawSegment(ctx, rect, Axis::Vertical, calculations[k], lowBound, upBound, Palette::GreyMiddle, k_quantileBarWidth);
drawSegment(ctx, rect, Axis::Vertical, calculations[k], lowBound, upBound, Palette::StatisticsBoxVerticalLine, k_quantileBarWidth);
}
if (isMainViewSelected()) {
drawSegment(ctx, rect, Axis::Vertical, calculations[(int)*m_selectedQuantile], lowBound, upBound, Palette::StatisticsBox, k_quantileBarWidth);

2
apps/statistics/histogram_view.h
View File

@@ -13,7 +13,7 @@ class HistogramController;
class HistogramView : public Shared::CurveView {
public:
HistogramView(HistogramController * controller, Store * store, int series, Shared::BannerView * bannerView, KDColor selectedHistogramColor = Palette::StatisticsSelect, KDColor notSelectedHistogramColor = Palette::GreyMiddle, KDColor selectedBarColor = Palette::StatisticsBox);
HistogramView(HistogramController * controller, Store * store, int series, Shared::BannerView * bannerView, KDColor selectedHistogramColor = Palette::StatisticsSelected, KDColor notSelectedHistogramColor = Palette::StatisticsNotSelected, KDColor selectedBarColor = Palette::StatisticsSelected);
int series() const { return m_series; }
void reload() override;
void reloadSelectedBar();

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

@@ -16,11 +16,16 @@ public:
constexpr static KDColor Toolbar = KDColor::RGB24(0xc03535);
constexpr static KDColor ToolbarText = KDColor::RGB24(0xffffff);
constexpr static KDColor ExpressionInputBackground = KDColor::RGB24(0xe0e0e0);
constexpr static KDColor ExpressionInputBorder = KDColor::RGB24(0xd9d9d9);
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);
constexpr static KDColor GridPrimaryLine = KDColor::RGB24(0xd9d9d9);
constexpr static KDColor GridSecondaryLine = KDColor::RGB24(0xf5f5f5);
constexpr static KDColor ScrollBarForeground = KDColor::RGB24(0x4a4a4a);
constexpr static KDColor ScrollBarBackground = KDColor::RGB24(0xd9d9d9);
// Controls (switches, gauge, arrows...)
constexpr static KDColor Control = KDColor::RGB24(0x00857f);
@@ -45,10 +50,14 @@ public:
// Probability
constexpr static KDColor ProbabilityCurve = KDColor::RGB24(0x00857f);
constexpr static KDColor ProbabilityCellBorder = KDColor::RGB24(0xececec);
constexpr static KDColor ProbabilityHistogramBar = KDColor::RGB24(0xd9d9d9);
// Statistics
constexpr static KDColor StatisticsBox = KDColor::RGB24(0x00857f);
constexpr static KDColor StatisticsSelect = KDColor::RGB24(0xe0e0e0);
constexpr static KDColor StatisticsBoxVerticalLine = KDColor::RGB24(0xd9d9d9);
constexpr static KDColor StatisticsSelected = KDColor::RGB24(0x00857f);
constexpr static KDColor StatisticsNotSelected = KDColor::RGB24(0xf5f5f5);
// Graph
constexpr static KDColor GraphTangent = KDColor::RGB24(0x595959);
@@ -74,6 +83,8 @@ public:
constexpr static KDColor ButtonBackgroundSelected = KDColor::RGB24(0xd1d1d1);
constexpr static KDColor ButtonBackgroundSelectedHighContrast = KDColor::RGB24(0x595959);
constexpr static KDColor ButtonBorder = KDColor::RGB24(0xadadad);
constexpr static KDColor ButtonRowBorder = KDColor::RGB24(0xd9d9d9);
constexpr static KDColor ButtonBorderOut = KDColor::RGB24(0xf5f5f5);
constexpr static KDColor ButtonShadow = KDColor::RGB24(0x003833);
constexpr static KDColor ButtonText = KDColor::RGB24(0x000000);

22
escher/src/button_row_controller.cpp
View File

@@ -96,28 +96,28 @@ void ButtonRowController::ContentView::layoutSubviews() {
void ButtonRowController::ContentView::drawRect(KDContext * ctx, KDRect rect) const {
if (numberOfButtons() == 0) {
if (m_position == Position::Top) {
ctx->fillRect(KDRect(0, 0, bounds().width(), 1), Palette::GreyWhite);
ctx->fillRect(KDRect(0, 0, bounds().width(), 1), Palette::ButtonBorderOut);
}
return;
}
if (m_style == Style::PlainWhite) {
if (m_position == Position::Top) {
ctx->fillRect(KDRect(0, 0, bounds().width(), k_plainStyleHeight), Palette::SubTabBackground);
ctx->fillRect(KDRect(0, k_plainStyleHeight, bounds().width(), 1), Palette::GreyWhite);
ctx->fillRect(KDRect(0, k_plainStyleHeight, bounds().width(), 1), Palette::ButtonBorderOut);
} else {
ctx->fillRect(KDRect(0, bounds().height() - k_plainStyleHeight, bounds().width(), k_plainStyleHeight), Palette::SubTabBackground);
ctx->fillRect(KDRect(0, bounds().height() - k_plainStyleHeight-1, bounds().width(), 1), Palette::GreyWhite);
ctx->fillRect(KDRect(0, bounds().height() - k_plainStyleHeight-1, bounds().width(), 1), Palette::ButtonBorderOut);
}
return;
}
int buttonHeight = m_size == Size::Small ? k_embossedStyleHeightSmall : k_embossedStyleHeightLarge;
int buttonMargin = m_size == Size::Small ? k_embossedStyleHeightMarginSmall : k_embossedStyleHeightMarginLarge;
if (m_position == Position::Top) {
ctx->fillRect(KDRect(0, 0, bounds().width(), buttonHeight), Palette::GreyWhite);
ctx->fillRect(KDRect(0, buttonHeight, bounds().width(), 1), Palette::GreyMiddle);
ctx->fillRect(KDRect(0, 0, bounds().width(), buttonHeight), Palette::ButtonBorderOut);
ctx->fillRect(KDRect(0, buttonHeight, bounds().width(), 1), Palette::ButtonRowBorder);
} else {
ctx->fillRect(KDRect(0, bounds().height() - buttonHeight, bounds().width(), buttonHeight), Palette::GreyWhite);
ctx->fillRect(KDRect(0, bounds().height() - buttonHeight-1, bounds().width(), 1), Palette::GreyMiddle);
ctx->fillRect(KDRect(0, bounds().height() - buttonHeight, bounds().width(), buttonHeight), Palette::ButtonBorderOut);
ctx->fillRect(KDRect(0, bounds().height() - buttonHeight-1, bounds().width(), 1), Palette::ButtonRowBorder);
}
KDCoordinate y0 = m_position == Position::Top ? buttonMargin-1 : bounds().height()-buttonHeight+buttonMargin-1;
KDCoordinate y1 = m_position == Position::Top ? buttonHeight-buttonMargin-2 : bounds().height()-buttonMargin;
@@ -132,12 +132,12 @@ void ButtonRowController::ContentView::drawRect(KDContext * ctx, KDRect rect) co
for (int i = 0; i < numberOfButtons(); i++) {
Button * button = buttonAtIndex(i);
KDCoordinate buttonWidth = button->minimalSizeForOptimalDisplay().width();
ctx->fillRect(KDRect(currentXOrigin, y0, 1, y1-y0+1), Palette::GreyMiddle);
ctx->fillRect(KDRect(currentXOrigin, y0, 1, y1-y0+1), Palette::ButtonRowBorder);
ctx->fillRect(KDRect(currentXOrigin-1, y0, 1, y1-y0+2), Palette::SecondaryText);
ctx->fillRect(KDRect(currentXOrigin, y0, buttonWidth+2, 1), Palette::GreyMiddle);
ctx->fillRect(KDRect(currentXOrigin, y1, buttonWidth+2, 1), Palette::GreyMiddle);
ctx->fillRect(KDRect(currentXOrigin, y0, buttonWidth+2, 1), Palette::ButtonRowBorder);
ctx->fillRect(KDRect(currentXOrigin, y1, buttonWidth+2, 1), Palette::ButtonRowBorder);
ctx->fillRect(KDRect(currentXOrigin, y1+1, buttonWidth+2, 1), Palette::SecondaryText);
ctx->fillRect(KDRect(currentXOrigin+1+buttonWidth, y0, 1, y1-y0+1), Palette::GreyMiddle);
ctx->fillRect(KDRect(currentXOrigin+1+buttonWidth, y0, 1, y1-y0+1), Palette::ButtonRowBorder);
currentXOrigin += buttonWidth + widthMargin;
}
}

2
escher/src/expression_field.cpp
View File

@@ -80,7 +80,7 @@ void ExpressionField::reload() {
void ExpressionField::drawRect(KDContext * ctx, KDRect rect) const {
// Draw the separator
ctx->fillRect(KDRect(0, 0, bounds().width(), k_separatorThickness), Palette::GreyMiddle);
ctx->fillRect(KDRect(0, 0, bounds().width(), k_separatorThickness), Palette::ExpressionInputBorder);
}
bool ExpressionField::handleEvent(Ion::Events::Event event) {

26
escher/src/palette.cpp
View File

@@ -9,11 +9,14 @@ constexpr KDColor Palette::BackgroundAppsSecondary;
constexpr KDColor Palette::Toolbar;
constexpr KDColor Palette::ToolbarText;
constexpr KDColor Palette::ExpressionInputBackground;
constexpr KDColor Palette::ExpressionInputBorder;
constexpr KDColor Palette::Battery;
constexpr KDColor Palette::BatteryInCharge;
constexpr KDColor Palette::BatteryLow;
constexpr KDColor Palette::ApproximateSignText;
constexpr KDColor Palette::ApproximateExpressionText;
constexpr KDColor Palette::ScrollBarForeground;
constexpr KDColor Palette::ScrollBarBackground;
constexpr KDColor Palette::Control;
constexpr KDColor Palette::ControlEnabled;
@@ -34,8 +37,13 @@ constexpr KDColor Palette::CodeOperator;
constexpr KDColor Palette::CodeString;
constexpr KDColor Palette::ProbabilityCurve;
constexpr KDColor Palette::ProbabilityCellBorder;
constexpr KDColor Palette::ProbabilityHistogramBar;
constexpr KDColor Palette::StatisticsBox;
constexpr KDColor Palette::StatisticsBoxVerticalLine;
constexpr KDColor Palette::StatisticsSelected;
constexpr KDColor Palette::StatisticsNotSelected;
constexpr KDColor Palette::GraphTangent;
@@ -56,6 +64,8 @@ constexpr KDColor Palette::ButtonBackground;
constexpr KDColor Palette::ButtonBackgroundSelected;
constexpr KDColor Palette::ButtonBackgroundSelectedHighContrast;
constexpr KDColor Palette::ButtonBorder;
constexpr KDColor Palette::ButtonRowBorder;
constexpr KDColor Palette::ButtonBorderOut;
constexpr KDColor Palette::ButtonShadow;
constexpr KDColor Palette::ButtonText;
@@ -79,6 +89,8 @@ constexpr KDColor Palette::BannerFirstVariantText;
constexpr KDColor Palette::BannerSecondBackground;
constexpr KDColor Palette::BannerSecondBorder;
constexpr KDColor Palette::BannerSecondText;
constexpr KDColor Palette::GridPrimaryLine;
constexpr KDColor Palette::GridSecondaryLine;
constexpr KDColor Palette::HomeBackground;
constexpr KDColor Palette::HomeCellBackground;
@@ -86,13 +98,13 @@ constexpr KDColor Palette::HomeCellBackgroundActive;
constexpr KDColor Palette::HomeCellText;
constexpr KDColor Palette::HomeCellTextActive;
constexpr KDColor Palette::YellowDark; // DONE
constexpr KDColor Palette::YellowLight; // DONE
constexpr KDColor Palette::PurpleBright; // DONE
constexpr KDColor Palette::PurpleDark; // DONE
constexpr KDColor Palette::GreyWhite;
constexpr KDColor Palette::GreyBright;
constexpr KDColor Palette::GreyMiddle;
constexpr KDColor Palette::YellowDark; // Done
constexpr KDColor Palette::YellowLight; // Done
constexpr KDColor Palette::PurpleBright; // Done
constexpr KDColor Palette::PurpleDark; // Done
constexpr KDColor Palette::GreyWhite; // Done
constexpr KDColor Palette::GreyBright; // Done
constexpr KDColor Palette::GreyMiddle; // Done
constexpr KDColor Palette::GreyDark; // Done
constexpr KDColor Palette::GreyVeryDark; // Done
constexpr KDColor Palette::Select; // Done

4
escher/src/scroll_view_indicator.cpp
View File

@@ -7,7 +7,7 @@ extern "C" {
ScrollViewIndicator::ScrollViewIndicator() :
View(),
m_color(Palette::SecondaryText),
m_color(Palette::ScrollBarForeground),
m_margin(14)
{
}
@@ -16,7 +16,7 @@ ScrollViewBar::ScrollViewBar() :
ScrollViewIndicator(),
m_offset(0),
m_visibleLength(0),
m_trackColor(Palette::GreyMiddle)
m_trackColor(Palette::ScrollBarBackground)
{
}