From 3071daa6f38c7aa2e335678857e7c61f25e6970e Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Wed, 27 Nov 2024 15:45:25 +0300 Subject: [PATCH] Replaced header style in statistics sections with classic subsections. --- Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.cpp | 2 -- .../SourceFiles/info/channel_statistics/earn/channel_earn.style | 1 + .../info/channel_statistics/earn/info_channel_earn_list.cpp | 1 - Telegram/SourceFiles/statistics/statistics.style | 2 +- Telegram/SourceFiles/statistics/widgets/chart_header_widget.cpp | 2 +- 5 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.cpp b/Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.cpp index 7b2072cda..b96427bca 100644 --- a/Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.cpp +++ b/Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.cpp @@ -143,7 +143,6 @@ void InnerWidget::fill() { Ui::AddSkip(container); Ui::AddDivider(container); Ui::AddSkip(container); - Ui::AddSkip(container); } { AddHeader(container, tr::lng_bot_earn_overview_title); @@ -279,7 +278,6 @@ void InnerWidget::fillHistory() { const auto outTabText = tr::lng_credits_summary_history_tab_out( tr::now); if (hasOneTab) { - Ui::AddSkip(inner); const auto header = inner->add( object_ptr(inner), st::statisticsLayerMargins diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style b/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style index 15df2c282..5d68e501b 100644 --- a/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style +++ b/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style @@ -37,6 +37,7 @@ channelEarnSemiboldLabel: FlatLabel(channelEarnOverviewMajorLabel) { channelEarnHeaderLabel: FlatLabel(channelEarnOverviewMajorLabel) { style: TextStyle(statisticsHeaderTitleTextStyle) { } + textFg: windowActiveTextFg; } channelEarnHistorySubLabel: FlatLabel(channelEarnOverviewSubMinorLabel) { style: TextStyle(defaultTextStyle) { diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp index 3a2250f39..08687b9c0 100644 --- a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp +++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp @@ -1014,7 +1014,6 @@ void InnerWidget::fill() { listsContainer, tr::lng_channel_earn_credits_history); slider->entity()->setActiveSectionFast(1); - AddSkip(listsContainer); } } else { slider->entity()->setActiveSectionFast(*sectionIndex); diff --git a/Telegram/SourceFiles/statistics/statistics.style b/Telegram/SourceFiles/statistics/statistics.style index 882623394..8cc22a9b9 100644 --- a/Telegram/SourceFiles/statistics/statistics.style +++ b/Telegram/SourceFiles/statistics/statistics.style @@ -59,7 +59,7 @@ statisticsPieChartPartOffset: 8px; statisticsChartHeaderHeight: 36px; statisticsChartHeaderPadding: margins(2px, 0px, 0px, 10px); statisticsHeaderTitleTextStyle: TextStyle(defaultTextStyle) { - font: font(13px); + font: font(boxFontSize semibold); } statisticsHeaderDatesTextStyle: TextStyle(defaultTextStyle) { font: font(11px); diff --git a/Telegram/SourceFiles/statistics/widgets/chart_header_widget.cpp b/Telegram/SourceFiles/statistics/widgets/chart_header_widget.cpp index f22cffcee..b8754ceb6 100644 --- a/Telegram/SourceFiles/statistics/widgets/chart_header_widget.cpp +++ b/Telegram/SourceFiles/statistics/widgets/chart_header_widget.cpp @@ -43,7 +43,7 @@ void Header::paintEvent(QPaintEvent *e) { p.fillRect(rect(), st::boxBg); - p.setPen(st::boxTextFg); + p.setPen(st::windowActiveTextFg); _title.drawLeftElided(p, 0, 0, width(), width()); p.setPen(st::windowSubTextFg);