From 25f401c22e2a22217891bdd97fde6d9cc1f95d59 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Tue, 11 Jul 2023 02:55:42 +0300 Subject: [PATCH] Changed color of axis captions to grey. --- Telegram/SourceFiles/statistics/chart_widget.cpp | 13 +++++++------ Telegram/SourceFiles/statistics/statistics.style | 2 ++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Telegram/SourceFiles/statistics/chart_widget.cpp b/Telegram/SourceFiles/statistics/chart_widget.cpp index e632833194..60eaee8e2b 100644 --- a/Telegram/SourceFiles/statistics/chart_widget.cpp +++ b/Telegram/SourceFiles/statistics/chart_widget.cpp @@ -77,7 +77,7 @@ void PaintHorizontalLines( r.y() + r.height() * line.relativeValue, r.x() + r.width(), st::lineWidth); - p.fillRect(lineRect, st::boxTextFg); + p.fillRect(lineRect, st::windowSubTextFg); } p.setOpacity(alpha); } @@ -88,10 +88,11 @@ void PaintCaptionsToHorizontalLines( const QRect &r) { const auto alpha = p.opacity(); p.setOpacity(horizontalLine.alpha); - p.setFont(st::boxTextFont->f); - p.setPen(st::boxTextFg); + p.setFont(st::statisticsDetailsBottomCaptionStyle.font); + p.setPen(st::windowSubTextFg); + const auto offset = r.y() - st::statisticsChartHorizontalLineCaptionSkip; for (const auto &line : horizontalLine.lines) { - p.drawText(10, r.y() + r.height() * line.relativeValue, line.caption); + p.drawText(0, offset + r.height() * line.relativeValue, line.caption); } p.setOpacity(alpha); } @@ -670,7 +671,7 @@ void ChartWidget::setupChartArea() { p.fillRect(bottom, st::boxBg); p.fillRect( QRect(bottom.x(), bottom.y(), bottom.width(), st::lineWidth), - st::boxTextFg); + st::windowSubTextFg); } { auto o = ScopedPainterOpacity(p, detailsAlpha); @@ -683,7 +684,7 @@ void ChartWidget::setupChartArea() { } } - p.setPen(st::boxTextFg); + p.setPen(st::windowSubTextFg); PaintBottomLine( p, _bottomLine.dates, diff --git a/Telegram/SourceFiles/statistics/statistics.style b/Telegram/SourceFiles/statistics/statistics.style index 110cad4d1a..19c5bc1812 100644 --- a/Telegram/SourceFiles/statistics/statistics.style +++ b/Telegram/SourceFiles/statistics/statistics.style @@ -17,6 +17,8 @@ statisticsDetailsPopupMidLineSpace: 8px; statisticsDetailsDotRadius: 4px; statisticsChartLineWidth: 2px; +statisticsChartHorizontalLineCaptionSkip: 4px; + statisticsChartBottomCaptionHeight: 30px; statisticsChartBottomCaptionSkip: 15px;