From d1bb87ccecda8f0d88b00e5685a97065e4fc9368 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Tue, 1 Mar 2022 08:22:56 +0300 Subject: [PATCH] Added ability to provide custom style to Settings::AddSubsectionTitle. --- .../calls/group/calls_group_rtmp.cpp | 30 +++++++------------ .../SourceFiles/settings/settings_common.cpp | 5 ++-- .../SourceFiles/settings/settings_common.h | 4 ++- 3 files changed, 16 insertions(+), 23 deletions(-) diff --git a/Telegram/SourceFiles/calls/group/calls_group_rtmp.cpp b/Telegram/SourceFiles/calls/group/calls_group_rtmp.cpp index a271c2a4d2..99b72eb7c2 100644 --- a/Telegram/SourceFiles/calls/group/calls_group_rtmp.cpp +++ b/Telegram/SourceFiles/calls/group/calls_group_rtmp.cpp @@ -272,16 +272,11 @@ void StartRtmpProcess::FillRtmpRows( }; // Server URL. - { - // Settings::AddSubsectionTitle - container->add( - object_ptr( - container, - tr::lng_group_call_rtmp_url_subtitle(), - *subsectionTitleStyle), - st::settingsSubsectionTitlePadding - + st::groupCallRtmpSubsectionTitleAddPadding); - } + Settings::AddSubsectionTitle( + container, + tr::lng_group_call_rtmp_url_subtitle(), + st::groupCallRtmpSubsectionTitleAddPadding, + subsectionTitleStyle); auto urlLabelContent = state->url.value(); addLabel(std::move(urlLabelContent), *labelStyle); @@ -300,16 +295,11 @@ void StartRtmpProcess::FillRtmpRows( container, st::groupCallRtmpKeySubsectionTitleSkip)); - { - // Settings::AddSubsectionTitle - container->add( - object_ptr( - container, - tr::lng_group_call_rtmp_key_subtitle(), - *subsectionTitleStyle), - st::settingsSubsectionTitlePadding - + st::groupCallRtmpSubsectionTitleAddPadding); - } + Settings::AddSubsectionTitle( + container, + tr::lng_group_call_rtmp_key_subtitle(), + st::groupCallRtmpSubsectionTitleAddPadding, + subsectionTitleStyle); auto keyLabelContent = rpl::combine( state->hidden.value(), diff --git a/Telegram/SourceFiles/settings/settings_common.cpp b/Telegram/SourceFiles/settings/settings_common.cpp index e8e4c7f3c3..8dfc2f8317 100644 --- a/Telegram/SourceFiles/settings/settings_common.cpp +++ b/Telegram/SourceFiles/settings/settings_common.cpp @@ -243,12 +243,13 @@ not_null AddButtonWithLabel( not_null AddSubsectionTitle( not_null container, rpl::producer text, - style::margins addPadding) { + style::margins addPadding, + const style::FlatLabel *st) { return container->add( object_ptr( container, std::move(text), - st::settingsSubsectionTitle), + st ? *st : st::settingsSubsectionTitle), st::settingsSubsectionTitlePadding + addPadding); } diff --git a/Telegram/SourceFiles/settings/settings_common.h b/Telegram/SourceFiles/settings/settings_common.h index 856ab22df0..786f3f038a 100644 --- a/Telegram/SourceFiles/settings/settings_common.h +++ b/Telegram/SourceFiles/settings/settings_common.h @@ -27,6 +27,7 @@ class SessionController; } // namespace Window namespace style { +struct FlatLabel; struct SettingsButton; } // namespace style @@ -141,7 +142,8 @@ void CreateRightLabel( not_null AddSubsectionTitle( not_null container, rpl::producer text, - style::margins addPadding = {}); + style::margins addPadding = {}, + const style::FlatLabel *st = nullptr); using MenuCallback = Fn