From f2f5ffd86177d08ddcc06aa89d5c2413a700aab9 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Wed, 2 Jul 2025 09:55:50 +0300 Subject: [PATCH] Moved out Type of ministars from class to separated enum class. --- Telegram/SourceFiles/boxes/send_credits_box.cpp | 2 +- .../view/media/history_view_service_box.cpp | 2 +- .../view/media/history_view_unique_gift.cpp | 2 +- .../info/peer_gifts/info_peer_gifts_common.cpp | 2 +- .../settings/settings_credits_graphics.cpp | 2 +- .../SourceFiles/ui/effects/premium_stars.cpp | 4 ++++ Telegram/SourceFiles/ui/effects/premium_stars.h | 16 ++++++++-------- .../ui/effects/premium_stars_colored.cpp | 4 ++-- .../ui/effects/premium_stars_colored.h | 4 ++-- .../SourceFiles/ui/effects/premium_top_bar.cpp | 4 ++-- 10 files changed, 23 insertions(+), 19 deletions(-) diff --git a/Telegram/SourceFiles/boxes/send_credits_box.cpp b/Telegram/SourceFiles/boxes/send_credits_box.cpp index 97cf32238b..9e33609715 100644 --- a/Telegram/SourceFiles/boxes/send_credits_box.cpp +++ b/Telegram/SourceFiles/boxes/send_credits_box.cpp @@ -327,7 +327,7 @@ void SendCreditsBox( const auto ministars = box->lifetime().make_state( ministarsContainer, false, - Ui::Premium::MiniStars::Type::BiStars); + Ui::Premium::MiniStarsType::BiStars); ministars->setColorOverride(Ui::Premium::CreditsIconGradientStops()); ministarsContainer->paintRequest( diff --git a/Telegram/SourceFiles/history/view/media/history_view_service_box.cpp b/Telegram/SourceFiles/history/view/media/history_view_service_box.cpp index 3cf6d7b776..44747c018d 100644 --- a/Telegram/SourceFiles/history/view/media/history_view_service_box.cpp +++ b/Telegram/SourceFiles/history/view/media/history_view_service_box.cpp @@ -107,7 +107,7 @@ ServiceBox::ServiceBox( if (_content->buttonMinistars()) { _button.stars = std::make_unique( [=](const QRect &) { repaint(); }, - Ui::Premium::MiniStars::Type::SlowStars); + Ui::Premium::MiniStarsType::SlowStars); _button.lastFg = std::make_unique(); } } diff --git a/Telegram/SourceFiles/history/view/media/history_view_unique_gift.cpp b/Telegram/SourceFiles/history/view/media/history_view_unique_gift.cpp index abda42b785..b44d10f000 100644 --- a/Telegram/SourceFiles/history/view/media/history_view_unique_gift.cpp +++ b/Telegram/SourceFiles/history/view/media/history_view_unique_gift.cpp @@ -99,7 +99,7 @@ ButtonPart::ButtonPart( , _link(std::move(link)) , _stars([=](const QRect &) { repaint(); -}, Ui::Premium::MiniStars::Type::SlowStars) +}, Ui::Premium::MiniStarsType::SlowStars) , _repaint(std::move(repaint)) { } diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp index 19012f3e96..51c83a2f77 100644 --- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp +++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp @@ -92,7 +92,7 @@ void GiftButton::setDescriptor(const GiftDescriptor &descriptor, Mode mode) { return; } auto player = base::take(_player); - const auto starsType = Ui::Premium::MiniStars::Type::SlowStars; + const auto starsType = Ui::Premium::MiniStarsType::SlowStars; _mediaLifetime.destroy(); unsubscribe(); diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp index e3531e1b9e..15d889fea8 100644 --- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp +++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp @@ -443,7 +443,7 @@ void AddMiniStars( const auto stars = widget->lifetime().make_state( widget, false, - Ui::Premium::MiniStars::Type::BiStars); + Ui::Premium::MiniStarsType::BiStars); stars->setColorOverride(Ui::Premium::CreditsIconGradientStops()); widget->resize(boxWidth - photoSize, photoSize * heightRatio); content->sizeValue( diff --git a/Telegram/SourceFiles/ui/effects/premium_stars.cpp b/Telegram/SourceFiles/ui/effects/premium_stars.cpp index ac42f11f27..36ef2d8c2e 100644 --- a/Telegram/SourceFiles/ui/effects/premium_stars.cpp +++ b/Telegram/SourceFiles/ui/effects/premium_stars.cpp @@ -14,9 +14,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL namespace Ui { namespace Premium { +namespace { +using Type = MiniStarsType; constexpr auto kDeformationMax = 0.1; +} // namespace + MiniStars::MiniStars( Fn updateCallback, bool opaque, diff --git a/Telegram/SourceFiles/ui/effects/premium_stars.h b/Telegram/SourceFiles/ui/effects/premium_stars.h index a98c0f69bb..aa4dcec8b1 100644 --- a/Telegram/SourceFiles/ui/effects/premium_stars.h +++ b/Telegram/SourceFiles/ui/effects/premium_stars.h @@ -14,19 +14,19 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL namespace Ui { namespace Premium { +enum class MiniStarsType { + MonoStars, + BiStars, + SlowStars, + DiamondStars, +}; + class MiniStars final { public: - enum class Type { - MonoStars, - BiStars, - SlowStars, - DiamondStars, - }; - MiniStars( Fn updateCallback, bool opaque = false, - Type type = Type::MonoStars); + MiniStarsType type = MiniStarsType::MonoStars); void paint(QPainter &p, const QRectF &rect); void setPaused(bool paused); diff --git a/Telegram/SourceFiles/ui/effects/premium_stars_colored.cpp b/Telegram/SourceFiles/ui/effects/premium_stars_colored.cpp index 7b7157b504..017e1b154d 100644 --- a/Telegram/SourceFiles/ui/effects/premium_stars_colored.cpp +++ b/Telegram/SourceFiles/ui/effects/premium_stars_colored.cpp @@ -226,7 +226,7 @@ bool CollectibleEmoji::readyInDefaultState() { ColoredMiniStars::ColoredMiniStars( not_null parent, bool optimizeUpdate, - MiniStars::Type type) + MiniStarsType type) : _ministars( optimizeUpdate ? Fn([=](const QRect &r) { @@ -239,7 +239,7 @@ ColoredMiniStars::ColoredMiniStars( ColoredMiniStars::ColoredMiniStars( Fn update, - MiniStars::Type type) + MiniStarsType type) : _ministars(update, true, type) { } diff --git a/Telegram/SourceFiles/ui/effects/premium_stars_colored.h b/Telegram/SourceFiles/ui/effects/premium_stars_colored.h index 0e53869e7a..42fff3cefd 100644 --- a/Telegram/SourceFiles/ui/effects/premium_stars_colored.h +++ b/Telegram/SourceFiles/ui/effects/premium_stars_colored.h @@ -25,8 +25,8 @@ public: ColoredMiniStars( not_null parent, bool optimizeUpdate, - MiniStars::Type type = MiniStars::Type::MonoStars); - ColoredMiniStars(Fn update, MiniStars::Type type); + MiniStarsType type = MiniStarsType::MonoStars); + ColoredMiniStars(Fn update, MiniStarsType type); void setSize(const QSize &size); void setPosition(QPoint position); diff --git a/Telegram/SourceFiles/ui/effects/premium_top_bar.cpp b/Telegram/SourceFiles/ui/effects/premium_top_bar.cpp index 03c8eaf5ed..9cfb5e35b9 100644 --- a/Telegram/SourceFiles/ui/effects/premium_top_bar.cpp +++ b/Telegram/SourceFiles/ui/effects/premium_top_bar.cpp @@ -116,8 +116,8 @@ TopBar::TopBar( this, descriptor.optimizeMinistars, (_logo == u"diamond"_q) - ? MiniStars::Type::DiamondStars - : MiniStars::Type::BiStars) { + ? MiniStarsType::DiamondStars + : MiniStarsType::BiStars) { std::move( descriptor.title ) | rpl::start_with_next([=](QString text) {