From 0089e53519d888344898fdd20279dfec5f996548 Mon Sep 17 00:00:00 2001 From: Jacopo De Simoi Date: Tue, 24 Nov 2020 10:15:32 -0500 Subject: [PATCH] [background] Use low contrast rules and dots in page backgrounds --- src/view/background/DottedBackgroundPainter.cpp | 4 ++-- src/view/background/GraphBackgroundPainter.cpp | 4 ++-- src/view/background/LineBackgroundPainter.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/view/background/DottedBackgroundPainter.cpp b/src/view/background/DottedBackgroundPainter.cpp index c2fda4c4..143f8d71 100644 --- a/src/view/background/DottedBackgroundPainter.cpp +++ b/src/view/background/DottedBackgroundPainter.cpp @@ -7,8 +7,8 @@ DottedBackgroundPainter::DottedBackgroundPainter() = default; DottedBackgroundPainter::~DottedBackgroundPainter() = default; void DottedBackgroundPainter::resetConfig() { - this->foregroundColor1 = 0xBDBDBDU; - this->lineWidth = 1.5; + this->foregroundColor1 = 0x303030U; + this->lineWidth = 1; this->drawRaster1 = 10; } diff --git a/src/view/background/GraphBackgroundPainter.cpp b/src/view/background/GraphBackgroundPainter.cpp index db919878..8860800a 100644 --- a/src/view/background/GraphBackgroundPainter.cpp +++ b/src/view/background/GraphBackgroundPainter.cpp @@ -18,11 +18,11 @@ void GraphBackgroundPainter::updateGraphColor() { return ((0xffU & uint32_t(color)) + (0xffU & (uint32_t(color) >> 8U)) + (0xffU & (uint32_t(color) >> 16U))) / 3; }; - this->foregroundColor1 = greyscale(backgroundColor) < 0x80U ? 0x202020U : 0xBDBDBDU; + this->foregroundColor1 = greyscale(backgroundColor) < 0x80U ? 0x303030U : 0xBDBDBDU; } void GraphBackgroundPainter::resetConfig() { - this->foregroundColor1 = 0xBDBDBDU; + this->foregroundColor1 = 0x303030; this->lineWidth = 0.5; this->drawRaster1 = 14.17; this->margin1 = 0; diff --git a/src/view/background/LineBackgroundPainter.cpp b/src/view/background/LineBackgroundPainter.cpp index 19a447c6..0248064d 100644 --- a/src/view/background/LineBackgroundPainter.cpp +++ b/src/view/background/LineBackgroundPainter.cpp @@ -7,8 +7,8 @@ LineBackgroundPainter::LineBackgroundPainter(bool verticalLine): verticalLine(ve LineBackgroundPainter::~LineBackgroundPainter() = default; void LineBackgroundPainter::resetConfig() { - this->foregroundColor1 = 0x40A0FFU; - this->foregroundColor2 = 0xFF0080U; + this->foregroundColor1 = 0x303030U; // Solarized subtle + this->foregroundColor2 = 0xDC322FU; // this->lineWidth = 0.5; }