From d2109dd2cb9d24859c776fe2d131b3910551cb79 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Thu, 14 Nov 2024 22:40:02 +0300 Subject: [PATCH] Replaced outer padding for chats filters strip with inner padding. --- .../ui/widgets/chat_filters_tabs_slider.cpp | 6 +++++- .../ui/widgets/chat_filters_tabs_strip.cpp | 12 ++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp index 2e51210ee..def399081 100644 --- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp +++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp @@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/effects/ripple_animation.h" #include "ui/widgets/side_bar_button.h" +#include "styles/style_dialogs.h" #include "styles/style_widgets.h" #include @@ -58,7 +59,8 @@ int ChatsFiltersTabs::centerOfSection(int section) const { void ChatsFiltersTabs::fitWidthToSections() { const auto widths = countSectionsWidths(0); - resizeToWidth(ranges::accumulate(widths, .0)); + const auto sliderPadding = st::dialogsSearchTabsPadding; + resizeToWidth(ranges::accumulate(widths, .0) + sliderPadding * 2); _lockedFromX = calculateLockedFromX(); { @@ -163,6 +165,8 @@ void ChatsFiltersTabs::paintEvent(QPaintEvent *e) { const auto range = getCurrentActiveRange(); const auto activeIndex = activeSection(); + p.translate(st::dialogsSearchTabsPadding, 0); + auto index = 0; auto raisedIndex = -1; auto activeHorizontalShift = 0; diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp index aecd13dbc..bd39d4ba6 100644 --- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp +++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp @@ -186,16 +186,12 @@ not_null AddChatFiltersTabsStrip( } const auto container = wrap->entity(); const auto scroll = Ui::CreateChild(container, scrollSt); - const auto sliderPadding = st::dialogsSearchTabsPadding; const auto slider = scroll->setOwnedWidget( - object_ptr>( + object_ptr( parent, - object_ptr( - parent, - trackActiveFilterAndUnreadAndReorder - ? st::dialogsSearchTabs - : st::chatsFiltersTabs), - QMargins(sliderPadding, 0, sliderPadding, 0)))->entity(); + trackActiveFilterAndUnreadAndReorder + ? st::dialogsSearchTabs + : st::chatsFiltersTabs)); const auto state = wrap->lifetime().make_state(); if (trackActiveFilterAndUnreadAndReorder) { using Reorder = Ui::ChatsFiltersTabsReorder;