From 494833236fbafcb6831d541be4a53f9ce69e0055 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Mon, 6 Apr 2026 16:23:24 +0300 Subject: [PATCH] Defaulted RoundButton text transform to no-transform. --- Telegram/SourceFiles/boxes/about_box.cpp | 3 +-- Telegram/SourceFiles/boxes/about_sponsored_box.cpp | 3 +-- .../SourceFiles/boxes/background_preview_box.cpp | 7 ++----- Telegram/SourceFiles/boxes/local_storage_box.cpp | 2 +- .../SourceFiles/boxes/select_future_owner_box.cpp | 12 ++++-------- Telegram/SourceFiles/boxes/star_gift_auction_box.cpp | 3 +-- Telegram/SourceFiles/boxes/star_gift_preview_box.cpp | 3 +-- Telegram/SourceFiles/boxes/url_auth_box_content.cpp | 12 ++++-------- .../SourceFiles/calls/group/calls_group_rtmp.cpp | 3 +-- .../chat_helpers/ttl_media_layer_widget.cpp | 3 +-- .../SourceFiles/dialogs/dialogs_inner_widget.cpp | 3 +-- .../ui/dialogs_top_bar_suggestion_content.cpp | 12 ++++-------- .../SourceFiles/dialogs/ui/posts_search_intro.cpp | 3 +-- .../SourceFiles/export/view/export_view_progress.cpp | 6 ++---- .../SourceFiles/export/view/export_view_settings.cpp | 6 ++---- Telegram/SourceFiles/history/history_widget.cpp | 3 +-- .../view/controls/history_view_compose_controls.cpp | 3 +-- .../history/view/history_view_contact_status.cpp | 3 +-- .../history/view/history_view_pinned_bar.cpp | 3 +-- .../history/view/history_view_scheduled_section.cpp | 3 +-- .../history/view/history_view_sticker_toast.cpp | 3 +-- .../history/view/history_view_translate_bar.cpp | 3 +-- .../boosts/create_giveaway_box.cpp | 3 +-- .../boosts/info_boosts_inner_widget.cpp | 6 ++---- .../earn/info_channel_earn_list.cpp | 3 +-- .../info/peer_gifts/info_peer_gifts_widget.cpp | 6 ++---- .../info/polls/info_polls_list_widget.cpp | 3 +-- .../info/profile/info_profile_actions.cpp | 6 ++---- .../info/profile/info_profile_top_bar.cpp | 6 ++---- .../info/similar_peers/info_similar_peers_widget.cpp | 4 ++-- .../info/stories/info_stories_inner_widget.cpp | 3 +-- .../SourceFiles/info/stories/info_stories_widget.cpp | 3 +-- .../info/userpic/info_userpic_emoji_builder.cpp | 3 +-- .../SourceFiles/inline_bots/inline_results_inner.cpp | 2 +- Telegram/SourceFiles/intro/intro_widget.cpp | 4 ++-- Telegram/SourceFiles/iv/iv_controller.cpp | 3 +-- .../media/stories/media_stories_controller.cpp | 3 +-- .../media/view/media_view_overlay_widget.cpp | 12 ++++-------- .../media/view/media_view_playback_sponsored.cpp | 3 +-- .../passport/passport_panel_edit_contact.cpp | 3 +-- .../SourceFiles/passport/passport_panel_password.cpp | 6 ++---- .../payments/ui/payments_form_summary.cpp | 9 +++------ .../settings_cloud_password_common.cpp | 3 +-- .../settings/sections/settings_credits.cpp | 3 +-- .../settings/sections/settings_folders.cpp | 5 ++--- .../settings/sections/settings_local_passcode.cpp | 3 +-- .../SourceFiles/settings/sections/settings_main.cpp | 12 ++++-------- .../settings/sections/settings_passkeys.cpp | 3 +-- .../settings/sections/settings_premium.cpp | 4 ++-- .../SourceFiles/settings/sections/settings_premium.h | 4 ++-- .../settings/settings_credits_graphics.cpp | 3 +-- Telegram/SourceFiles/statistics/chart_widget.cpp | 6 ++---- .../SourceFiles/ui/boxes/collectible_info_box.cpp | 6 ++---- Telegram/SourceFiles/ui/boxes/confirm_phone_box.cpp | 3 +-- .../SourceFiles/ui/boxes/show_or_premium_box.cpp | 3 +-- .../SourceFiles/ui/chat/choose_theme_controller.cpp | 6 ++---- Telegram/SourceFiles/ui/chat/group_call_bar.cpp | 3 +-- .../SourceFiles/ui/controls/invite_link_buttons.cpp | 12 ++++-------- Telegram/SourceFiles/ui/controls/location_picker.cpp | 3 +-- Telegram/SourceFiles/ui/controls/table_rows.cpp | 3 +-- .../window/themes/window_theme_warning.cpp | 4 ++-- Telegram/SourceFiles/window/window_lock_widgets.cpp | 2 +- Telegram/SourceFiles/window/window_setup_email.cpp | 9 +++------ Telegram/lib_ui | 2 +- 64 files changed, 103 insertions(+), 192 deletions(-) diff --git a/Telegram/SourceFiles/boxes/about_box.cpp b/Telegram/SourceFiles/boxes/about_box.cpp index a40f7f6346..738ad20837 100644 --- a/Telegram/SourceFiles/boxes/about_box.cpp +++ b/Telegram/SourceFiles/boxes/about_box.cpp @@ -302,8 +302,7 @@ void ArchiveHintBox( auto button = object_ptr( box, tr::lng_archive_hint_button(), - st::defaultActiveButton, - Ui::RoundButtonTextNoTransform); + st::defaultActiveButton); button->resizeToWidth(box->width() - st.buttonPadding.left() - st.buttonPadding.left()); diff --git a/Telegram/SourceFiles/boxes/about_sponsored_box.cpp b/Telegram/SourceFiles/boxes/about_sponsored_box.cpp index 113217a177..e4af2b8a1a 100644 --- a/Telegram/SourceFiles/boxes/about_sponsored_box.cpp +++ b/Telegram/SourceFiles/boxes/about_sponsored_box.cpp @@ -35,8 +35,7 @@ void AboutSponsoredBox(not_null box) { const auto button = Ui::CreateChild( row, rpl::single(kUrl.utf8()), - st, - RoundButtonTextNoTransform); + st); button->setBrushOverride(Qt::NoBrush); button->setPenOverride(QPen(st::historyLinkInFg)); rpl::combine( diff --git a/Telegram/SourceFiles/boxes/background_preview_box.cpp b/Telegram/SourceFiles/boxes/background_preview_box.cpp index 6a95ecfb28..dd07ffd5e7 100644 --- a/Telegram/SourceFiles/boxes/background_preview_box.cpp +++ b/Telegram/SourceFiles/boxes/background_preview_box.cpp @@ -758,8 +758,7 @@ void BackgroundPreviewBox::applyForPeer() { const auto forMe = CreateChild( overlay, tr::lng_background_apply_me(), - st::backgroundConfirm, - RoundButtonTextNoTransform); + st::backgroundConfirm); forMe->setClickedCallback([=] { applyForPeer(false); }); @@ -770,7 +769,6 @@ void BackgroundPreviewBox::applyForPeer() { lt_user, rpl::single(_forPeer->shortName())), st::backgroundConfirm, - RoundButtonTextNoTransform, Data::AmPremiumValue(&_forPeer->session()) | rpl::map(!_1)); forBoth->setClickedCallback([=] { if (_forPeer->session().premium()) { @@ -784,8 +782,7 @@ void BackgroundPreviewBox::applyForPeer() { const auto cancel = CreateChild( overlay, tr::lng_cancel(), - st::backgroundConfirmCancel, - RoundButtonTextNoTransform); + st::backgroundConfirmCancel); cancel->setClickedCallback([=] { const auto raw = _forBothOverlay.release(); raw->shownValue() | rpl::filter( diff --git a/Telegram/SourceFiles/boxes/local_storage_box.cpp b/Telegram/SourceFiles/boxes/local_storage_box.cpp index 1bdac1a7f0..cf1fdc0456 100644 --- a/Telegram/SourceFiles/boxes/local_storage_box.cpp +++ b/Telegram/SourceFiles/boxes/local_storage_box.cpp @@ -168,7 +168,7 @@ LocalStorageBox::Row::Row( this, sizeText(data), st::localStorageRowSize) -, _clear(this, std::move(clear), st::localStorageClear, Ui::RoundButtonTextNoTransform) { +, _clear(this, std::move(clear), st::localStorageClear) { _clear->setVisible(data.count != 0); } diff --git a/Telegram/SourceFiles/boxes/select_future_owner_box.cpp b/Telegram/SourceFiles/boxes/select_future_owner_box.cpp index fc138160af..6b7967ad4f 100644 --- a/Telegram/SourceFiles/boxes/select_future_owner_box.cpp +++ b/Telegram/SourceFiles/boxes/select_future_owner_box.cpp @@ -321,8 +321,7 @@ void SelectFutureOwnerbox( !adminsAreEqual ? tr::lng_select_next_owner_box() : tr::lng_select_next_owner_box_admin(), - st::defaultLightButton, - Ui::RoundButtonTextNoTransform), + st::defaultLightButton), st::boxRowPadding, style::al_justify); Ui::AddSkip(content); @@ -330,8 +329,7 @@ void SelectFutureOwnerbox( object_ptr( content, tr::lng_cancel(), - st::defaultLightButton, - Ui::RoundButtonTextNoTransform), + st::defaultLightButton), st::boxRowPadding, style::al_justify); cancel->setClickedCallback([=] { @@ -344,8 +342,7 @@ void SelectFutureOwnerbox( isGroup ? tr::lng_profile_leave_group() : tr::lng_profile_leave_channel(), - st::attentionBoxButton, - Ui::RoundButtonTextNoTransform), + st::attentionBoxButton), st::boxRowPadding, style::al_justify); leave->setClickedCallback([=, revoke = false] { @@ -479,8 +476,7 @@ void SelectFutureOwnerbox( }), tr::lng_select_next_owner_box_confirm(), tr::lng_close()), - st::defaultActiveButton, - Ui::RoundButtonTextNoTransform); + st::defaultActiveButton); const auto raw = button.data(); rpl::combine( state->selectionChanges.events() | rpl::map_to(0), diff --git a/Telegram/SourceFiles/boxes/star_gift_auction_box.cpp b/Telegram/SourceFiles/boxes/star_gift_auction_box.cpp index 4dc7935847..312b75351b 100644 --- a/Telegram/SourceFiles/boxes/star_gift_auction_box.cpp +++ b/Telegram/SourceFiles/boxes/star_gift_auction_box.cpp @@ -1983,8 +1983,7 @@ object_ptr MakeActiveAuctionRow( object_ptr( raw, rpl::single(QString()), - st::auctionListRaise, - RoundButtonTextNoTransform), + st::auctionListRaise), st::auctionListRaisePadding); auto secondsLeft = rpl::duplicate( diff --git a/Telegram/SourceFiles/boxes/star_gift_preview_box.cpp b/Telegram/SourceFiles/boxes/star_gift_preview_box.cpp index 3ab7a4a414..72ac5b9d32 100644 --- a/Telegram/SourceFiles/boxes/star_gift_preview_box.cpp +++ b/Telegram/SourceFiles/boxes/star_gift_preview_box.cpp @@ -1559,8 +1559,7 @@ void StarGiftPreviewBox( auto owned = object_ptr( buttonsParent, text(), - st, - RoundButtonTextNoTransform); + st); const auto raw = owned.data(); raw->setClickedCallback([=] { diff --git a/Telegram/SourceFiles/boxes/url_auth_box_content.cpp b/Telegram/SourceFiles/boxes/url_auth_box_content.cpp index 232751aff1..726d7ceaef 100644 --- a/Telegram/SourceFiles/boxes/url_auth_box_content.cpp +++ b/Telegram/SourceFiles/boxes/url_auth_box_content.cpp @@ -82,8 +82,7 @@ void ShowMatchCodesBox( const auto button = Ui::CreateChild( buttons, rpl::single(emojiCode ? QString() : code), - st::urlAuthCodesButton, - Ui::RoundButtonTextNoTransform); + st::urlAuthCodesButton); if (emojiCode) { button->setTextFgOverride(QColor(Qt::transparent)); const auto overlay = Ui::CreateChild(button); @@ -200,8 +199,7 @@ void ShowMatchCodesBox( object_ptr( content, tr::lng_cancel(), - st::attentionBoxButton, - Ui::RoundButtonTextNoTransform), + st::attentionBoxButton), padding); PrepareFullWidthRoundButton(button, content, padding); button->setClickedCallback([=] { @@ -550,8 +548,7 @@ void ShowDetails( object_ptr( content, tr::lng_url_auth_login_button(), - st::defaultLightButton, - Ui::RoundButtonTextNoTransform), + st::defaultLightButton), padding); PrepareFullWidthRoundButton(button, content, padding); button->setClickedCallback([=] { @@ -588,8 +585,7 @@ void ShowDetails( object_ptr( content, tr::lng_suggest_action_decline(), - st::attentionBoxButton, - Ui::RoundButtonTextNoTransform), + st::attentionBoxButton), padding); PrepareFullWidthRoundButton(button, content, padding); button->setClickedCallback([=] { diff --git a/Telegram/SourceFiles/calls/group/calls_group_rtmp.cpp b/Telegram/SourceFiles/calls/group/calls_group_rtmp.cpp index c5e9c7c165..7fd579b465 100644 --- a/Telegram/SourceFiles/calls/group/calls_group_rtmp.cpp +++ b/Telegram/SourceFiles/calls/group/calls_group_rtmp.cpp @@ -257,8 +257,7 @@ void StartRtmpProcess::FillRtmpRows( auto button = Ui::CreateChild( wrap.data(), rpl::duplicate(text), - st::groupCallRtmpCopyButton, - Ui::RoundButtonTextNoTransform); + st::groupCallRtmpCopyButton); button->setClickedCallback(key ? Fn([=] { QGuiApplication::clipboard()->setText(state->key.current()); diff --git a/Telegram/SourceFiles/chat_helpers/ttl_media_layer_widget.cpp b/Telegram/SourceFiles/chat_helpers/ttl_media_layer_widget.cpp index f0b0aa23b0..919c360ec1 100644 --- a/Telegram/SourceFiles/chat_helpers/ttl_media_layer_widget.cpp +++ b/Telegram/SourceFiles/chat_helpers/ttl_media_layer_widget.cpp @@ -198,8 +198,7 @@ PreviewWrap::PreviewWrap( item->out() ? tr::lng_close() : tr::lng_ttl_voice_close_in(), - st::ttlMediaButton, - Ui::RoundButtonTextNoTransform); + st::ttlMediaButton); close->setFullRadius(true); close->setClickedCallback(closeCallback); diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp index 98b6f5095b..cbcc309442 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp +++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp @@ -4333,8 +4333,7 @@ void InnerWidget::refreshEmpty() { _emptyButton.create( this, tr::lng_no_conversations_button(), - st::dialogEmptyButton, - Ui::RoundButtonTextNoTransform); + st::dialogEmptyButton); _emptyButton->setVisible(isListVisible); _emptyButton->setClickedCallback([=, window = _controller] { window->show(PrepareContactsBox(window)); diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_top_bar_suggestion_content.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_top_bar_suggestion_content.cpp index 89bfd36bd0..97e368a451 100644 --- a/Telegram/SourceFiles/dialogs/ui/dialogs_top_bar_suggestion_content.cpp +++ b/Telegram/SourceFiles/dialogs/ui/dialogs_top_bar_suggestion_content.cpp @@ -126,13 +126,11 @@ not_null*> CreateUnconfirmedAuthContent( const auto yes = Ui::CreateChild( buttons, tr::lng_unconfirmed_auth_confirm(), - st::dialogsUnconfirmedAuthButton, - Ui::RoundButtonTextNoTransform); + st::dialogsUnconfirmedAuthButton); const auto no = Ui::CreateChild( buttons, tr::lng_unconfirmed_auth_deny(), - st::dialogsUnconfirmedAuthButtonNo, - Ui::RoundButtonTextNoTransform); + st::dialogsUnconfirmedAuthButtonNo); yes->setClickedCallback([=] { wrap->toggle(false, anim::type::normal); base::call_delayed(st::universalDuration, wrap, [=] { @@ -237,8 +235,7 @@ void ShowAuthDeniedBox( object_ptr( box, rpl::single(QString()), - st::defaultActiveButton, - Ui::RoundButtonTextNoTransform)); + st::defaultActiveButton)); confirm->setClickedCallback([=] { box->closeBox(); }); @@ -363,8 +360,7 @@ void TopBarSuggestionContent::setRightButton( _rightButton = base::make_unique_q( this, rpl::single(QString()), - st::dialogsTopBarRightButton, - RoundButtonTextNoTransform); + st::dialogsTopBarRightButton); _rightButton->setText(std::move(text)); rpl::combine( sizeValue(), diff --git a/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp b/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp index c3a6362bd3..d21aea9c00 100644 --- a/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp +++ b/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp @@ -185,8 +185,7 @@ void PostsSearchIntro::setup() { object_ptr( _content.get(), rpl::single(QString()), - st::postsSearchIntroButton, - Ui::RoundButtonTextNoTransform), + st::postsSearchIntroButton), style::al_top); _footer = _content->add( object_ptr( diff --git a/Telegram/SourceFiles/export/view/export_view_progress.cpp b/Telegram/SourceFiles/export/view/export_view_progress.cpp index bec4905c5e..9ffcbe2fd4 100644 --- a/Telegram/SourceFiles/export/view/export_view_progress.cpp +++ b/Telegram/SourceFiles/export/view/export_view_progress.cpp @@ -277,8 +277,7 @@ ProgressWidget::ProgressWidget( _cancel = base::make_unique_q( this, tr::lng_export_stop(), - st::exportCancelButton, - Ui::RoundButtonTextNoTransform); + st::exportCancelButton); setupBottomButton(_cancel.get()); } @@ -361,8 +360,7 @@ void ProgressWidget::showDone() { _done = base::make_unique_q( this, tr::lng_export_done(), - st::exportDoneButton, - Ui::RoundButtonTextNoTransform); + st::exportDoneButton); const auto desired = std::min( st::exportDoneButton.style.font->width(tr::lng_export_done(tr::now)) + st::exportDoneButton.height diff --git a/Telegram/SourceFiles/export/view/export_view_settings.cpp b/Telegram/SourceFiles/export/view/export_view_settings.cpp index 26aa8be841..1964ff00f0 100644 --- a/Telegram/SourceFiles/export/view/export_view_settings.cpp +++ b/Telegram/SourceFiles/export/view/export_view_settings.cpp @@ -885,8 +885,7 @@ void SettingsWidget::refreshButtons( ? Ui::CreateChild( container.get(), tr::lng_export_start(), - st::defaultBoxButton, - Ui::RoundButtonTextNoTransform) + st::defaultBoxButton) : nullptr; if (start) { start->show(); @@ -903,8 +902,7 @@ void SettingsWidget::refreshButtons( const auto cancel = Ui::CreateChild( container.get(), tr::lng_cancel(), - st::defaultBoxButton, - Ui::RoundButtonTextNoTransform); + st::defaultBoxButton); cancel->show(); _cancelClicks = cancel->clicks() | rpl::to_empty; diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp index 14c11d5c9d..9b5e34dc77 100644 --- a/Telegram/SourceFiles/history/history_widget.cpp +++ b/Telegram/SourceFiles/history/history_widget.cpp @@ -5878,8 +5878,7 @@ bool HistoryWidget::updateCmdStartShown() { (_botMenu.text.isEmpty() ? tr::lng_bot_menu_button() : rpl::single(_botMenu.text)), - st::historyBotMenuButton, - Ui::RoundButtonTextNoTransform); + st::historyBotMenuButton); orderWidgets(); _botMenu.button->setFullRadius(true); diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp index 35009d8035..8780c92df8 100644 --- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp +++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp @@ -3074,8 +3074,7 @@ void SetupRestrictionView( auto unlock = std::make_unique( widget, rpl::single(text), - st->premiumRequired.button, - RoundButtonTextNoTransform); + st->premiumRequired.button); unlock->show(); unlock->setAttribute(Qt::WA_TransparentForMouseEvents); unlock->setFullRadius(true); diff --git a/Telegram/SourceFiles/history/view/history_view_contact_status.cpp b/Telegram/SourceFiles/history/view/history_view_contact_status.cpp index e2a0f1e9be..f3c826f09d 100644 --- a/Telegram/SourceFiles/history/view/history_view_contact_status.cpp +++ b/Telegram/SourceFiles/history/view/history_view_contact_status.cpp @@ -1014,8 +1014,7 @@ BusinessBotStatus::Bar::Bar(QWidget *parent) , _togglePaused( this, rpl::single(QString()), - st::historyBusinessBotToggle, - Ui::RoundButtonTextNoTransform) + st::historyBusinessBotToggle) , _settings(this, st::historyBusinessBotSettings) { _name->setAttribute(Qt::WA_TransparentForMouseEvents); _status->setAttribute(Qt::WA_TransparentForMouseEvents); diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp index cb514f6ffa..5ac0728691 100644 --- a/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp +++ b/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp @@ -170,8 +170,7 @@ auto WithPinnedTitle(not_null session, PinnedId id) { auto button = object_ptr( parent, rpl::never(), // Text is handled by the inner label. - stButton, - Ui::RoundButtonTextNoTransform); + stButton); const auto label = Ui::CreateChild( button.data(), diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp index caffea103f..bf1d2721e8 100644 --- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp +++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp @@ -1741,8 +1741,7 @@ bool ShowScheduledVideoPublished( const auto button = Ui::CreateChild( widget.get(), rpl::single(view), - st::processingVideoView, - Ui::RoundButtonTextNoTransform); + st::processingVideoView); button->show(); rpl::combine( widget->sizeValue(), diff --git a/Telegram/SourceFiles/history/view/history_view_sticker_toast.cpp b/Telegram/SourceFiles/history/view/history_view_sticker_toast.cpp index 94131da727..68446736c5 100644 --- a/Telegram/SourceFiles/history/view/history_view_sticker_toast.cpp +++ b/Telegram/SourceFiles/history/view/history_view_sticker_toast.cpp @@ -201,8 +201,7 @@ void StickerToast::showWithTitle(const QString &title) { const auto button = Ui::CreateChild( widget.get(), rpl::single(view), - st::historyPremiumViewSet, - Ui::RoundButtonTextNoTransform); + st::historyPremiumViewSet); button->show(); rpl::combine( widget->sizeValue(), diff --git a/Telegram/SourceFiles/history/view/history_view_translate_bar.cpp b/Telegram/SourceFiles/history/view/history_view_translate_bar.cpp index e117aa12e6..349065bdc6 100644 --- a/Telegram/SourceFiles/history/view/history_view_translate_bar.cpp +++ b/Telegram/SourceFiles/history/view/history_view_translate_bar.cpp @@ -599,8 +599,7 @@ void TranslateBar::showToast( const auto button = Ui::CreateChild( widget.get(), rpl::single(buttonText), - st::historyPremiumViewSet, - Ui::RoundButtonTextNoTransform); + st::historyPremiumViewSet); button->show(); rpl::combine( widget->sizeValue(), 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 091f717cc1..df14f19bbd 100644 --- a/Telegram/SourceFiles/info/channel_statistics/boosts/create_giveaway_box.cpp +++ b/Telegram/SourceFiles/info/channel_statistics/boosts/create_giveaway_box.cpp @@ -1344,8 +1344,7 @@ void CreateGiveawayBox( auto button = object_ptr( box, rpl::never(), - st::giveawayGiftCodeStartButton, - Ui::RoundButtonTextNoTransform); + st::giveawayGiftCodeStartButton); AddLabelWithBadgeToButton( button, diff --git a/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_inner_widget.cpp index cf8e330635..0475266629 100644 --- a/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_inner_widget.cpp +++ b/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_inner_widget.cpp @@ -202,14 +202,12 @@ void FillShareLink( const auto copy = CreateChild( wrap, tr::lng_group_invite_context_copy(), - st::inviteLinkCopy, - Ui::RoundButtonTextNoTransform); + st::inviteLinkCopy); copy->setClickedCallback(copyLink); const auto share = CreateChild( wrap, tr::lng_group_invite_context_share(), - st::inviteLinkShare, - Ui::RoundButtonTextNoTransform); + st::inviteLinkShare); share->setClickedCallback(shareLink); wrap->widthValue( 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 eda9510d4f..84a3b86eb6 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 @@ -594,8 +594,7 @@ void InnerWidget::fill() { auto button = object_ptr( container, tr::lng_channel_earn_learn_close(), - st::defaultActiveButton, - Ui::RoundButtonTextNoTransform); + st::defaultActiveButton); button->resizeToWidth(box->width() - st.buttonPadding.left() - st.buttonPadding.left()); diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp index 38512b4905..37c790ccd8 100644 --- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp +++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp @@ -1305,8 +1305,7 @@ void InnerWidget::refreshAbout() { object_ptr( about.get(), rpl::single(QString()), - st::collectionEmptyButton, - Ui::RoundButtonTextNoTransform), + st::collectionEmptyButton), st::collectionEmptyAddMargin, style::al_top); button->setText(tr::lng_gift_collection_add_button( @@ -2495,8 +2494,7 @@ void Widget::setupBottomButton(int wasBottomHeight) { const auto button = Ui::CreateChild( bottom, rpl::single(QString()), - st::collectionEditBox.button, - Ui::RoundButtonTextNoTransform); + st::collectionEditBox.button); button->setText(tr::lng_gift_collection_add_button( ) | rpl::map([](const QString &text) { return Ui::Text::IconEmoji(&st::collectionAddIcon).append(text); diff --git a/Telegram/SourceFiles/info/polls/info_polls_list_widget.cpp b/Telegram/SourceFiles/info/polls/info_polls_list_widget.cpp index 67d56caf45..0c848e506f 100644 --- a/Telegram/SourceFiles/info/polls/info_polls_list_widget.cpp +++ b/Telegram/SourceFiles/info/polls/info_polls_list_widget.cpp @@ -269,8 +269,7 @@ void ListWidget::Inner::setupHistory() { _newPollButton.create( _scroll.get(), tr::lng_polls_create_title(), - st::defaultActiveButton, - Ui::RoundButtonTextNoTransform); + st::defaultActiveButton); _newPollButton->setFullRadius(true); _newPollButton->setClickedCallback([=] { Window::PeerMenuCreatePoll( diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp index 9c0369d112..ad5c68892f 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp @@ -633,8 +633,7 @@ base::options::toggle ShowChannelJoinedBelowAbout({ const auto link = Ui::CreateChild( labelWrap, std::move(linkText), - st::defaultTableSmallButton, - Ui::RoundButtonTextNoTransform); + st::defaultTableSmallButton); link->setClickedCallback([=] { state->myTimezone = !state->myTimezone.current(); state->expanded = true; @@ -2133,8 +2132,7 @@ void DetailsFiller::setupMainApp(bool suppressBottom) { object_ptr( _wrap, tr::lng_profile_open_app(), - st::infoOpenApp, - Ui::RoundButtonTextNoTransform), + st::infoOpenApp), st::infoOpenAppMargin, style::al_justify); diff --git a/Telegram/SourceFiles/info/profile/info_profile_top_bar.cpp b/Telegram/SourceFiles/info/profile/info_profile_top_bar.cpp index 59f0533907..691c37ba16 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_top_bar.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_top_bar.cpp @@ -328,8 +328,7 @@ TopBar::TopBar( object_ptr( this, tr::lng_status_lastseen_when(), - st::infoProfileTopBarShowLastSeen, - Ui::RoundButtonTextNoTransform)) + st::infoProfileTopBarShowLastSeen)) , _forumButton([&, controller = descriptor.controller] { const auto topic = _key.topic(); if (!topic) { @@ -338,8 +337,7 @@ TopBar::TopBar( auto owned = object_ptr( this, rpl::single(QString()), - st::infoProfileTopBarTopicStatusButton, - Ui::RoundButtonTextNoTransform); + st::infoProfileTopBarTopicStatusButton); owned->setText(Info::Profile::NameValue( _peer ) | rpl::map([=](const QString &name) { diff --git a/Telegram/SourceFiles/info/similar_peers/info_similar_peers_widget.cpp b/Telegram/SourceFiles/info/similar_peers/info_similar_peers_widget.cpp index 9a993f9eaf..f91aacf6ff 100644 --- a/Telegram/SourceFiles/info/similar_peers/info_similar_peers_widget.cpp +++ b/Telegram/SourceFiles/info/similar_peers/info_similar_peers_widget.cpp @@ -156,8 +156,8 @@ void ListController::setupUnlock() { ? tr::lng_similar_channels_show_more() : tr::lng_similar_bots_show_more()), st::similarChannelsLock, - Ui::RoundButtonTextToUpper, - rpl::single(true)); + rpl::single(true), + Ui::RoundButtonTextToUpper); button->setClickedCallback([=] { const auto window = _controller->parentController(); ::Settings::ShowPremium(window, u"similar_channels"_q); diff --git a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp index c22174e3c9..bceac09a79 100644 --- a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp +++ b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp @@ -717,8 +717,7 @@ void InnerWidget::refreshEmpty() { object_ptr( empty.get(), rpl::single(QString()), - st::collectionEmptyButton, - Ui::RoundButtonTextNoTransform), + st::collectionEmptyButton), st::collectionEmptyAddMargin, style::al_top); button->setText(tr::lng_stories_album_add_button( diff --git a/Telegram/SourceFiles/info/stories/info_stories_widget.cpp b/Telegram/SourceFiles/info/stories/info_stories_widget.cpp index e641def468..08a870fc76 100644 --- a/Telegram/SourceFiles/info/stories/info_stories_widget.cpp +++ b/Telegram/SourceFiles/info/stories/info_stories_widget.cpp @@ -230,8 +230,7 @@ void Widget::setupBottomButton(int wasBottomHeight) { const auto button = Ui::CreateChild( bottom, rpl::single(QString()), - st::collectionEditBox.button, - Ui::RoundButtonTextNoTransform); + st::collectionEditBox.button); button->setText(tr::lng_stories_album_add_button( ) | rpl::map([](const QString &text) { return Ui::Text::IconEmoji(&st::collectionAddIcon).append(text); diff --git a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder.cpp b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder.cpp index e32c273f94..83a30ef868 100644 --- a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder.cpp +++ b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder.cpp @@ -44,8 +44,7 @@ void ShowLayer( const auto save = Ui::CreateChild( content.get(), tr::lng_connection_save(), - st::userpicBuilderEmojiButton, - Ui::RoundButtonTextNoTransform); + st::userpicBuilderEmojiButton); content->sizeValue( ) | rpl::on_next([=] { const auto &p = st::userpicBuilderEmojiSavePosiiton; diff --git a/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp b/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp index 672e46980e..48a6cb1e37 100644 --- a/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp +++ b/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp @@ -512,7 +512,7 @@ void Inner::refreshSwitchPmButton(const CacheEntry *entry) { _switchPmUrl = QByteArray(); } else { if (!_switchPmButton) { - _switchPmButton.create(this, nullptr, st::switchPmButton, Ui::RoundButtonTextNoTransform); + _switchPmButton.create(this, nullptr, st::switchPmButton); _switchPmButton->show(); _switchPmButton->addClickHandler([=] { switchPm(); }); } diff --git a/Telegram/SourceFiles/intro/intro_widget.cpp b/Telegram/SourceFiles/intro/intro_widget.cpp index daa8f822e4..4684a608c0 100644 --- a/Telegram/SourceFiles/intro/intro_widget.cpp +++ b/Telegram/SourceFiles/intro/intro_widget.cpp @@ -88,7 +88,7 @@ Widget::Widget( Ui::RoundButtonTextToUpper)) , _next( this, - object_ptr(this, nullptr, *_nextStyle, Ui::RoundButtonTextNoTransform)) + object_ptr(this, nullptr, *_nextStyle)) , _connecting(std::make_unique( this, account, @@ -355,7 +355,7 @@ void Widget::setupStep() { _next.destroy(); _next.create( this, - object_ptr(this, nullptr, *nextStyle, Ui::RoundButtonTextNoTransform)); + object_ptr(this, nullptr, *nextStyle)); showControls(); updateControlsGeometry(); _next->toggle(wasShown, anim::type::instant); diff --git a/Telegram/SourceFiles/iv/iv_controller.cpp b/Telegram/SourceFiles/iv/iv_controller.cpp index 343874b215..87ab701e8c 100644 --- a/Telegram/SourceFiles/iv/iv_controller.cpp +++ b/Telegram/SourceFiles/iv/iv_controller.cpp @@ -97,8 +97,7 @@ public: const auto reset = Ui::CreateChild( this, rpl::single(QString()), - st::ivResetZoom, - Ui::RoundButtonTextNoTransform); + st::ivResetZoom); processTooltip(reset); const auto resetLabel = Ui::CreateChild( reset, diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp index 8a1aca63c9..3ac7b92a7d 100644 --- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp +++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp @@ -265,8 +265,7 @@ void Controller::Unsupported::setup(not_null peer) { _button = std::make_unique( wrap, tr::lng_update_telegram(), - st::storiesUnsupportedUpdate, - Ui::RoundButtonTextNoTransform); + st::storiesUnsupportedUpdate); _button->show(); rpl::combine( diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp index f2f1552b23..aa09778d85 100644 --- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp +++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp @@ -1794,8 +1794,7 @@ void OverlayWidget::refreshVoteButton() { _voteButton.create( _body, tr::lng_polls_submit_votes(), - st::mediaviewVoteButton, - Ui::RoundButtonTextNoTransform); + st::mediaviewVoteButton); const auto effect = Ui::CreateChild( _voteButton.data()); effect->setOpacity(_controlsOpacity.current()); @@ -4909,8 +4908,7 @@ void OverlayWidget::initThemePreview() { _themeApply.create( _body, tr::lng_theme_preview_apply(), - st::themePreviewApplyButton, - Ui::RoundButtonTextNoTransform); + st::themePreviewApplyButton); _themeApply->show(); _themeApply->setClickedCallback([=] { const auto &object = Background()->themeObject(); @@ -4926,16 +4924,14 @@ void OverlayWidget::initThemePreview() { _themeCancel.create( _body, tr::lng_cancel(), - st::themePreviewCancelButton, - Ui::RoundButtonTextNoTransform); + st::themePreviewCancelButton); _themeCancel->show(); _themeCancel->setClickedCallback([this] { close(); }); if (const auto slug = _themeCloudData.slug; !slug.isEmpty()) { _themeShare.create( _body, tr::lng_theme_share(), - st::themePreviewCancelButton, - Ui::RoundButtonTextNoTransform); + st::themePreviewCancelButton); _themeShare->show(); _themeShare->setClickedCallback([=] { QGuiApplication::clipboard()->setText( diff --git a/Telegram/SourceFiles/media/view/media_view_playback_sponsored.cpp b/Telegram/SourceFiles/media/view/media_view_playback_sponsored.cpp index ce490ac96f..8024ceed8c 100644 --- a/Telegram/SourceFiles/media/view/media_view_playback_sponsored.cpp +++ b/Telegram/SourceFiles/media/view/media_view_playback_sponsored.cpp @@ -325,8 +325,7 @@ PlaybackSponsored::Message::Message( , _about(std::make_unique( this, tr::lng_search_sponsored_button(), - _aboutSt, - Ui::RoundButtonTextNoTransform)) + _aboutSt)) , _close( std::make_unique( this, diff --git a/Telegram/SourceFiles/passport/passport_panel_edit_contact.cpp b/Telegram/SourceFiles/passport/passport_panel_edit_contact.cpp index dd7c1063cb..ca4e4989a7 100644 --- a/Telegram/SourceFiles/passport/passport_panel_edit_contact.cpp +++ b/Telegram/SourceFiles/passport/passport_panel_edit_contact.cpp @@ -141,8 +141,7 @@ void VerifyBox::setupControls( object_ptr( _content, tr::lng_intro_fragment_button(), - st::fragmentBoxButton, - Ui::RoundButtonTextNoTransform), + st::fragmentBoxButton), small); _content->widthValue( ) | rpl::on_next([=](int w) { diff --git a/Telegram/SourceFiles/passport/passport_panel_password.cpp b/Telegram/SourceFiles/passport/passport_panel_password.cpp index b60ccd9da3..c44a385790 100644 --- a/Telegram/SourceFiles/passport/passport_panel_password.cpp +++ b/Telegram/SourceFiles/passport/passport_panel_password.cpp @@ -241,16 +241,14 @@ void PanelNoPassword::refreshBottom() { const auto cancel = Ui::CreateChild( container, tr::lng_cancel(), - st::defaultBoxButton, - Ui::RoundButtonTextNoTransform); + st::defaultBoxButton); cancel->addClickHandler([=] { _controller->cancelPasswordSubmit(); }); const auto validate = Ui::CreateChild( container, tr::lng_passport_email_validate(), - st::defaultBoxButton, - Ui::RoundButtonTextNoTransform); + st::defaultBoxButton); validate->addClickHandler([=] { _controller->validateRecoveryEmail(); }); diff --git a/Telegram/SourceFiles/payments/ui/payments_form_summary.cpp b/Telegram/SourceFiles/payments/ui/payments_form_summary.cpp index 9718e67499..bb178a0530 100644 --- a/Telegram/SourceFiles/payments/ui/payments_form_summary.cpp +++ b/Telegram/SourceFiles/payments/ui/payments_form_summary.cpp @@ -83,15 +83,13 @@ FormSummary::FormSummary( tr::lng_payments_pay_amount( lt_amount, rpl::single(formatAmount(computeTotalAmount()))), - st::paymentsPanelSubmit, - RoundButtonTextNoTransform)) + st::paymentsPanelSubmit)) , _cancel( this, (_invoice.receipt.paid ? tr::lng_about_done() : tr::lng_cancel()), - st::paymentsPanelButton, - RoundButtonTextNoTransform) + st::paymentsPanelButton) , _tipLightBg(TransparentColor(st::paymentsTipActive, kLightOpacity)) , _tipLightRipple( TransparentColor(st::paymentsTipActive, kLightRippleOpacity)) @@ -397,8 +395,7 @@ void FormSummary::setupSuggestedTips(not_null layout) { .widget = CreateChild( outer, rpl::single(formatAmount(amount, true)), - st, - RoundButtonTextNoTransform), + st), }); auto &button = state->buttons.back(); button.widget->show(); diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_common.cpp b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_common.cpp index 1f2ce04990..4418d6415a 100644 --- a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_common.cpp +++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_common.cpp @@ -229,8 +229,7 @@ not_null AddDoneButton( object_ptr( content, std::move(text), - st::changePhoneButton, - Ui::RoundButtonTextNoTransform), + st::changePhoneButton), st::settingLocalPasscodeButtonPadding, style::al_top); return button; diff --git a/Telegram/SourceFiles/settings/sections/settings_credits.cpp b/Telegram/SourceFiles/settings/sections/settings_credits.cpp index 21b9fc0b56..f8be46fcf1 100644 --- a/Telegram/SourceFiles/settings/sections/settings_credits.cpp +++ b/Telegram/SourceFiles/settings/sections/settings_credits.cpp @@ -496,8 +496,7 @@ void Credits::setupContent() { object_ptr( content, nullptr, - st::creditsSettingsBigBalanceButton, - Ui::RoundButtonTextNoTransform), + st::creditsSettingsBigBalanceButton), st::boxRowPadding, style::al_top); button->setContext([&]() -> Ui::Text::MarkedContext { diff --git a/Telegram/SourceFiles/settings/sections/settings_folders.cpp b/Telegram/SourceFiles/settings/sections/settings_folders.cpp index d19dcfb1ed..3ea34301bc 100644 --- a/Telegram/SourceFiles/settings/sections/settings_folders.cpp +++ b/Telegram/SourceFiles/settings/sections/settings_folders.cpp @@ -180,12 +180,11 @@ FilterRowButton::FilterRowButton( : RippleButton(parent, st::defaultRippleAnimation) , _session(session) , _remove(this, st::filtersRemove) -, _restore(this, tr::lng_filters_restore(), st::settingsFilterAddRecommended, Ui::RoundButtonTextNoTransform) +, _restore(this, tr::lng_filters_restore(), st::settingsFilterAddRecommended) , _add( this, tr::lng_filters_recommended_add(), - st::settingsFilterAddRecommended, - Ui::RoundButtonTextNoTransform) + st::settingsFilterAddRecommended) , _state(description.isEmpty() ? State::Normal : State::Suggested) { _restore.setFullRadius(true); _add.setFullRadius(true); diff --git a/Telegram/SourceFiles/settings/sections/settings_local_passcode.cpp b/Telegram/SourceFiles/settings/sections/settings_local_passcode.cpp index 2bcc29a511..ac204ade07 100644 --- a/Telegram/SourceFiles/settings/sections/settings_local_passcode.cpp +++ b/Telegram/SourceFiles/settings/sections/settings_local_passcode.cpp @@ -209,8 +209,7 @@ void LocalPasscodeEnter::setupContent() { : isCheck ? tr::lng_passcode_check_button() : tr::lng_passcode_change_button()), - st::changePhoneButton, - Ui::RoundButtonTextNoTransform), + st::changePhoneButton), st::settingLocalPasscodeButtonPadding, style::al_top); button->setClickedCallback([=] { diff --git a/Telegram/SourceFiles/settings/sections/settings_main.cpp b/Telegram/SourceFiles/settings/sections/settings_main.cpp index fa48873808..52bb5fe4b2 100644 --- a/Telegram/SourceFiles/settings/sections/settings_main.cpp +++ b/Telegram/SourceFiles/settings/sections/settings_main.cpp @@ -852,8 +852,7 @@ void SetupValidatePhoneNumberSuggestion( const auto yes = Ui::CreateChild( wrap, tr::lng_box_yes(), - st::inviteLinkButton, - Ui::RoundButtonTextNoTransform); + st::inviteLinkButton); yes->setClickedCallback([=] { controller->session().promoSuggestions().dismiss( kSugValidatePhone.utf8()); @@ -862,8 +861,7 @@ void SetupValidatePhoneNumberSuggestion( const auto no = Ui::CreateChild( wrap, tr::lng_box_no(), - st::inviteLinkButton, - Ui::RoundButtonTextNoTransform); + st::inviteLinkButton); no->setClickedCallback([=] { const auto sharedLabel = std::make_shared>(); const auto height = st::boxLabel.style.font->height; @@ -954,8 +952,7 @@ void SetupValidatePasswordSuggestion( const auto yes = Ui::CreateChild( wrap, tr::lng_settings_suggestion_password_yes(), - st::inviteLinkButton, - Ui::RoundButtonTextNoTransform); + st::inviteLinkButton); yes->setClickedCallback([=] { controller->session().promoSuggestions().dismiss( Data::PromoSuggestions::SugValidatePassword()); @@ -964,8 +961,7 @@ void SetupValidatePasswordSuggestion( const auto no = Ui::CreateChild( wrap, tr::lng_settings_suggestion_password_no(), - st::inviteLinkButton, - Ui::RoundButtonTextNoTransform); + st::inviteLinkButton); no->setClickedCallback([=] { showOther(Settings::CloudPasswordSuggestionInputId()); }); diff --git a/Telegram/SourceFiles/settings/sections/settings_passkeys.cpp b/Telegram/SourceFiles/settings/sections/settings_passkeys.cpp index bc3f869d4c..9d0f52dd8a 100644 --- a/Telegram/SourceFiles/settings/sections/settings_passkeys.cpp +++ b/Telegram/SourceFiles/settings/sections/settings_passkeys.cpp @@ -453,8 +453,7 @@ void PasskeysNoneBox( canRegister ? tr::lng_settings_passkeys_none_button() : tr::lng_settings_passkeys_none_button_unsupported(), - st::defaultActiveButton, - Ui::RoundButtonTextNoTransform); + st::defaultActiveButton); const auto createButton = button.data(); button->resizeToWidth(box->width() - st.buttonPadding.left() diff --git a/Telegram/SourceFiles/settings/sections/settings_premium.cpp b/Telegram/SourceFiles/settings/sections/settings_premium.cpp index 3cde34a72b..8d0a068139 100644 --- a/Telegram/SourceFiles/settings/sections/settings_premium.cpp +++ b/Telegram/SourceFiles/settings/sections/settings_premium.cpp @@ -1937,8 +1937,8 @@ not_null CreateLockedButton( not_null parent, rpl::producer text, const style::RoundButton &st, - Ui::RoundButtonTextTransform transform, - rpl::producer locked) { + rpl::producer locked, + Ui::RoundButtonTextTransform transform) { const auto result = Ui::CreateChild( parent.get(), rpl::single(QString()), diff --git a/Telegram/SourceFiles/settings/sections/settings_premium.h b/Telegram/SourceFiles/settings/sections/settings_premium.h index 275234bb42..557d6cedef 100644 --- a/Telegram/SourceFiles/settings/sections/settings_premium.h +++ b/Telegram/SourceFiles/settings/sections/settings_premium.h @@ -97,8 +97,8 @@ struct SubscribeButtonArgs final { not_null parent, rpl::producer text, const style::RoundButton &st, - Ui::RoundButtonTextTransform transform, - rpl::producer locked); + rpl::producer locked, + Ui::RoundButtonTextTransform transform = Ui::RoundButtonTextTransform{}); [[nodiscard]] not_null CreateSubscribeButton( SubscribeButtonArgs &&args); diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp index 9a15348c94..f507df9a11 100644 --- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp +++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp @@ -3346,8 +3346,7 @@ void AddWithdrawalWidget( const auto buttonCredits = Ui::CreateChild( buttonsContainer, tr::lng_bot_earn_balance_button_buy_ads(), - stButton, - Ui::RoundButtonTextNoTransform); + stButton); { const auto icon = Ui::CreateChild(buttonCredits); const auto &st = st::msgBotKbUrlIcon; diff --git a/Telegram/SourceFiles/statistics/chart_widget.cpp b/Telegram/SourceFiles/statistics/chart_widget.cpp index f66738036f..600299e168 100644 --- a/Telegram/SourceFiles/statistics/chart_widget.cpp +++ b/Telegram/SourceFiles/statistics/chart_widget.cpp @@ -1319,8 +1319,7 @@ void ChartWidget::processLocalZoom(int xIndex) { const auto zoomOutButton = Ui::CreateChild( header, tr::lng_stats_zoom_out(), - st::statisticsHeaderButton, - Ui::RoundButtonTextNoTransform); + st::statisticsHeaderButton); zoomOutButton->moveToRight( 0, (header->height() - zoomOutButton->height()) / 2); @@ -1532,8 +1531,7 @@ void ChartWidget::setZoomedChartData( const auto zoomOutButton = Ui::CreateChild( customHeader, tr::lng_stats_zoom_out(), - st::statisticsHeaderButton, - Ui::RoundButtonTextNoTransform); + st::statisticsHeaderButton); zoomOutButton->moveToRight( 0, (customHeader->height() - zoomOutButton->height()) / 2); diff --git a/Telegram/SourceFiles/ui/boxes/collectible_info_box.cpp b/Telegram/SourceFiles/ui/boxes/collectible_info_box.cpp index 8cb102aa14..9f9ec3ed5f 100644 --- a/Telegram/SourceFiles/ui/boxes/collectible_info_box.cpp +++ b/Telegram/SourceFiles/ui/boxes/collectible_info_box.cpp @@ -230,8 +230,7 @@ void CollectibleInfoBox( object_ptr( box, tr::lng_collectible_learn_more(), - st::collectibleMore, - RoundButtonTextNoTransform), + st::collectibleMore), st::collectibleMorePadding); more->setClickedCallback([url = info.url] { File::OpenUrl(url); @@ -243,8 +242,7 @@ void CollectibleInfoBox( auto owned = object_ptr( box, phrase(), - st::collectibleCopy, - RoundButtonTextNoTransform); + st::collectibleCopy); const auto copy = owned.data(); copy->setClickedCallback([copyCallback] { copyCallback(true); diff --git a/Telegram/SourceFiles/ui/boxes/confirm_phone_box.cpp b/Telegram/SourceFiles/ui/boxes/confirm_phone_box.cpp index 8b95730179..6d8526f92a 100644 --- a/Telegram/SourceFiles/ui/boxes/confirm_phone_box.cpp +++ b/Telegram/SourceFiles/ui/boxes/confirm_phone_box.cpp @@ -32,8 +32,7 @@ ConfirmPhoneBox::ConfirmPhoneBox( _fragment.create( this, tr::lng_intro_fragment_button(), - st::fragmentBoxButton, - RoundButtonTextNoTransform); + st::fragmentBoxButton); _fragment->setClickedCallback([=] { File::OpenUrl(openUrl); }); } if (timeout) { diff --git a/Telegram/SourceFiles/ui/boxes/show_or_premium_box.cpp b/Telegram/SourceFiles/ui/boxes/show_or_premium_box.cpp index c2cb37d0d5..fd1fb8ecfc 100644 --- a/Telegram/SourceFiles/ui/boxes/show_or_premium_box.cpp +++ b/Telegram/SourceFiles/ui/boxes/show_or_premium_box.cpp @@ -157,8 +157,7 @@ void ShowOrPremiumBox( object_ptr( box, std::move(skin.showButton), - st::showOrShowButton, - RoundButtonTextNoTransform), + st::showOrShowButton), buttonPadding); box->addRow( MakeShowOrLabel(box, std::move(skin.orPremium)), diff --git a/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp b/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp index 8cbb19fc1f..68d3770400 100644 --- a/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp +++ b/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp @@ -291,13 +291,11 @@ void ChooseThemeController::initButtons() { const auto apply = CreateChild( controls, tr::lng_chat_theme_apply(), - st::defaultLightButton, - RoundButtonTextNoTransform); + st::defaultLightButton); const auto choose = CreateChild( controls, tr::lng_chat_theme_change_wallpaper(), - st::defaultLightButton, - RoundButtonTextNoTransform); + st::defaultLightButton); const auto &margin = st::chatThemeButtonMargin; controls->resize( diff --git a/Telegram/SourceFiles/ui/chat/group_call_bar.cpp b/Telegram/SourceFiles/ui/chat/group_call_bar.cpp index 3adb8cd65a..fbe3227b1a 100644 --- a/Telegram/SourceFiles/ui/chat/group_call_bar.cpp +++ b/Telegram/SourceFiles/ui/chat/group_call_bar.cpp @@ -190,8 +190,7 @@ void GroupCallBar::refreshScheduledProcess() { _join = std::make_unique( _inner.get(), tr::lng_group_call_join(), - st::groupCallTopBarJoin, - RoundButtonTextNoTransform); + st::groupCallTopBarJoin); setupRightButton(_join.get()); } } else if (!_scheduledProcess) { diff --git a/Telegram/SourceFiles/ui/controls/invite_link_buttons.cpp b/Telegram/SourceFiles/ui/controls/invite_link_buttons.cpp index e000e65614..b798465965 100644 --- a/Telegram/SourceFiles/ui/controls/invite_link_buttons.cpp +++ b/Telegram/SourceFiles/ui/controls/invite_link_buttons.cpp @@ -41,14 +41,12 @@ void AddCopyShareLinkButtons( const auto copy = CreateChild( wrap, tr::lng_group_invite_copy(), - st::inviteLinkCopy, - RoundButtonTextNoTransform); + st::inviteLinkCopy); copy->setClickedCallback(copyLink); const auto share = CreateChild( wrap, tr::lng_group_invite_share(), - st::inviteLinkShare, - RoundButtonTextNoTransform); + st::inviteLinkShare); share->setClickedCallback(shareLink); wrap->widthValue( @@ -69,8 +67,7 @@ void AddReactivateLinkButton( object_ptr( container, tr::lng_group_invite_reactivate(), - st::inviteLinkReactivate, - RoundButtonTextNoTransform), + st::inviteLinkReactivate), st::inviteLinkButtonsPadding); button->setClickedCallback(editLink); } @@ -82,8 +79,7 @@ void AddDeleteLinkButton( object_ptr( container, tr::lng_group_invite_delete(), - st::inviteLinkDelete, - RoundButtonTextNoTransform), + st::inviteLinkDelete), st::inviteLinkButtonsPadding); button->setClickedCallback(deleteLink); } diff --git a/Telegram/SourceFiles/ui/controls/location_picker.cpp b/Telegram/SourceFiles/ui/controls/location_picker.cpp index 0c0d3284c8..dd9c20334c 100644 --- a/Telegram/SourceFiles/ui/controls/location_picker.cpp +++ b/Telegram/SourceFiles/ui/controls/location_picker.cpp @@ -686,8 +686,7 @@ not_null SetupMapPlaceholder( const auto button = CreateChild( result, tr::lng_maps_select_on_map(), - st::pickLocationChooseOnMap, - RoundButtonTextNoTransform); + st::pickLocationChooseOnMap); button->setFullRadius(true); button->setClickedCallback(choose); diff --git a/Telegram/SourceFiles/ui/controls/table_rows.cpp b/Telegram/SourceFiles/ui/controls/table_rows.cpp index 6535c2e775..40692d96ea 100644 --- a/Telegram/SourceFiles/ui/controls/table_rows.cpp +++ b/Telegram/SourceFiles/ui/controls/table_rows.cpp @@ -109,8 +109,7 @@ ValueWithSmallButton MakeValueWithSmallButton( const auto button = CreateChild( raw, std::move(buttonText), - table->st().smallButton, - RoundButtonTextNoTransform); + table->st().smallButton); if (handler) { button->setClickedCallback([button, handler = std::move(handler)] { handler(button); diff --git a/Telegram/SourceFiles/window/themes/window_theme_warning.cpp b/Telegram/SourceFiles/window/themes/window_theme_warning.cpp index 1549453027..4de7a3b8c8 100644 --- a/Telegram/SourceFiles/window/themes/window_theme_warning.cpp +++ b/Telegram/SourceFiles/window/themes/window_theme_warning.cpp @@ -29,8 +29,8 @@ WarningWidget::WarningWidget(QWidget *parent) : RpWidget(parent) , _timer([=] { handleTimer(); }) , _secondsLeft(kWaitBeforeRevertMs / 1000) -, _keepChanges(this, tr::lng_theme_keep_changes(), st::defaultBoxButton, Ui::RoundButtonTextNoTransform) -, _revert(this, tr::lng_theme_revert(), st::defaultBoxButton, Ui::RoundButtonTextNoTransform) { +, _keepChanges(this, tr::lng_theme_keep_changes(), st::defaultBoxButton) +, _revert(this, tr::lng_theme_revert(), st::defaultBoxButton) { _keepChanges->setClickedCallback([] { KeepApplied(); }); _revert->setClickedCallback([] { Revert(); }); updateText(); diff --git a/Telegram/SourceFiles/window/window_lock_widgets.cpp b/Telegram/SourceFiles/window/window_lock_widgets.cpp index bf7b9b5118..0ae535df96 100644 --- a/Telegram/SourceFiles/window/window_lock_widgets.cpp +++ b/Telegram/SourceFiles/window/window_lock_widgets.cpp @@ -98,7 +98,7 @@ PasscodeLockWidget::PasscodeLockWidget( not_null window) : LockWidget(parent, window) , _passcode(this, st::passcodeInput, tr::lng_passcode_ph()) -, _submit(this, tr::lng_passcode_submit(), st::passcodeSubmit, Ui::RoundButtonTextNoTransform) +, _submit(this, tr::lng_passcode_submit(), st::passcodeSubmit) , _logout(this, tr::lng_passcode_logout(tr::now)) { connect(_passcode, &Ui::MaskedInputField::changed, [=] { changed(); }); connect(_passcode, &Ui::MaskedInputField::submitted, [=] { submit(); }); diff --git a/Telegram/SourceFiles/window/window_setup_email.cpp b/Telegram/SourceFiles/window/window_setup_email.cpp index 877a94e0bf..48b71a1258 100644 --- a/Telegram/SourceFiles/window/window_setup_email.cpp +++ b/Telegram/SourceFiles/window/window_setup_email.cpp @@ -125,8 +125,7 @@ SetupEmailLockWidget::SetupEmailLockWidget( _logoutButton = object_ptr( this, tr::lng_settings_logout(), - st::defaultBoxButton, - Ui::RoundButtonTextNoTransform); + st::defaultBoxButton); if (session) { session->promoSuggestions().setSetupEmailState( Data::SetupEmailState::SettingUpNoSkip); @@ -150,8 +149,7 @@ SetupEmailLockWidget::SetupEmailLockWidget( _debugButton = object_ptr( this, rpl::single(u"[DEBUG] Clear bio"_q), - st::defaultBoxButton, - Ui::RoundButtonTextNoTransform); + st::defaultBoxButton); _debugButton->setClickedCallback([=] { session->api().saveSelfBio({}); }); @@ -225,8 +223,7 @@ SetupEmailLockWidget::SetupEmailLockWidget( object_ptr( _layout, tr::lng_settings_cloud_login_email_confirm(), - st::changePhoneButton, - Ui::RoundButtonTextNoTransform), + st::changePhoneButton), st::boxRowPadding, style::al_top); diff --git a/Telegram/lib_ui b/Telegram/lib_ui index d43113e6bb..841e271a57 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit d43113e6bb3508a97154ffebc3c1744fdfd2a6a3 +Subproject commit 841e271a571dd43488be101a2eff22881ac4a724