diff --git a/Telegram/SourceFiles/boxes/gift_premium_box.cpp b/Telegram/SourceFiles/boxes/gift_premium_box.cpp index 10ad9409d..339e7ee30 100644 --- a/Telegram/SourceFiles/boxes/gift_premium_box.cpp +++ b/Telegram/SourceFiles/boxes/gift_premium_box.cpp @@ -1147,16 +1147,18 @@ void GiftCodeBox( object_ptr( box, st::giveawayGiftCodeCover, - nullptr, - rpl::conditional( - state->used.value(), - tr::lng_gift_link_used_title(), - tr::lng_gift_link_title()), - rpl::conditional( - state->used.value(), - tr::lng_gift_link_used_about(Ui::Text::RichLangValue), - tr::lng_gift_link_about(Ui::Text::RichLangValue)), - true)); + Ui::Premium::TopBarDescriptor{ + .clickContextOther = nullptr, + .title = rpl::conditional( + state->used.value(), + tr::lng_gift_link_used_title(), + tr::lng_gift_link_title()), + .about = rpl::conditional( + state->used.value(), + tr::lng_gift_link_used_about(Ui::Text::RichLangValue), + tr::lng_gift_link_about(Ui::Text::RichLangValue)), + .light = true, + })); const auto max = st::giveawayGiftCodeTopHeight; bar->setMaximumHeight(max); @@ -1283,13 +1285,15 @@ void GiftCodePendingBox( object_ptr( box, st, - clickContext, - tr::lng_gift_link_title(), - tr::lng_gift_link_pending_about( - lt_user, - rpl::single(Ui::Text::Link(resultToName)), - Ui::Text::RichLangValue), - true)); + Ui::Premium::TopBarDescriptor{ + .clickContextOther = clickContext, + .title = tr::lng_gift_link_title(), + .about = tr::lng_gift_link_pending_about( + lt_user, + rpl::single(Ui::Text::Link(resultToName)), + Ui::Text::RichLangValue), + .light = true, + })); const auto max = st::giveawayGiftCodeTopHeight; bar->setMaximumHeight(max); diff --git a/Telegram/SourceFiles/info/channel_statistics/boosts/create_giveaway_box.cpp b/Telegram/SourceFiles/info/channel_statistics/boosts/create_giveaway_box.cpp index 4734718b9..629d6949b 100644 --- a/Telegram/SourceFiles/info/channel_statistics/boosts/create_giveaway_box.cpp +++ b/Telegram/SourceFiles/info/channel_statistics/boosts/create_giveaway_box.cpp @@ -174,13 +174,15 @@ void AddPremiumTopBarWithDefaultTitleBar( const auto bar = Ui::CreateChild( box.get(), st::startGiveawayCover, - nullptr, - tr::lng_giveaway_new_title(), - (group - ? tr::lng_giveaway_new_about_group - : tr::lng_giveaway_new_about)(Ui::Text::RichLangValue), - true, - false); + Ui::Premium::TopBarDescriptor{ + .clickContextOther = nullptr, + .title = tr::lng_giveaway_new_title(), + .about = (group + ? tr::lng_giveaway_new_about_group + : tr::lng_giveaway_new_about)(Ui::Text::RichLangValue), + .light = true, + .optimizeMinistars = false, + }); bar->setAttribute(Qt::WA_TransparentForMouseEvents); box->addRow( diff --git a/Telegram/SourceFiles/settings/settings_premium.cpp b/Telegram/SourceFiles/settings/settings_premium.cpp index 057f36d2d..9a003d3d2 100644 --- a/Telegram/SourceFiles/settings/settings_premium.cpp +++ b/Telegram/SourceFiles/settings/settings_premium.cpp @@ -1064,9 +1064,11 @@ QPointer Premium::createPinnedToTop( return Ui::CreateChild( parent.get(), st::defaultPremiumCover, - clickContextOther, - std::move(title), - std::move(about)); + Ui::Premium::TopBarDescriptor{ + .clickContextOther = clickContextOther, + .title = std::move(title), + .about = std::move(about), + }); }(); _setPaused = [=](bool paused) { content->setPaused(paused); diff --git a/Telegram/SourceFiles/ui/effects/premium_top_bar.cpp b/Telegram/SourceFiles/ui/effects/premium_top_bar.cpp index 5ef11ba50..c5f12ad6f 100644 --- a/Telegram/SourceFiles/ui/effects/premium_top_bar.cpp +++ b/Telegram/SourceFiles/ui/effects/premium_top_bar.cpp @@ -164,23 +164,6 @@ void TopBarAbstract::computeIsDark() { _isDark = (contrast > kMinAcceptableContrast); } -TopBar::TopBar( - not_null parent, - const style::PremiumCover &st, - Fn clickContextOther, - rpl::producer title, - rpl::producer about, - bool light, - bool optimizeMinistars) -: TopBar(parent, st, { - .clickContextOther = std::move(clickContextOther), - .title = std::move(title), - .about = std::move(about), - .light = light, - .optimizeMinistars = optimizeMinistars, -}) { -} - TopBar::TopBar( not_null parent, const style::PremiumCover &st, diff --git a/Telegram/SourceFiles/ui/effects/premium_top_bar.h b/Telegram/SourceFiles/ui/effects/premium_top_bar.h index 4ac3cc8be..13e8a38c7 100644 --- a/Telegram/SourceFiles/ui/effects/premium_top_bar.h +++ b/Telegram/SourceFiles/ui/effects/premium_top_bar.h @@ -75,14 +75,6 @@ struct TopBarDescriptor { class TopBar final : public TopBarAbstract { public: - TopBar( - not_null parent, - const style::PremiumCover &st, - Fn clickContextOther, - rpl::producer title, - rpl::producer about, - bool light = false, - bool optimizeMinistars = true); TopBar( not_null parent, const style::PremiumCover &st,