From 9d09a637fe65dc158d28fa5c583293fe0e957412 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Tue, 6 Jan 2026 07:57:47 +0300 Subject: [PATCH] Slightly simplified resize handler for menu items. --- Telegram/SourceFiles/calls/group/calls_cover_item.cpp | 4 ++-- Telegram/SourceFiles/calls/group/calls_group_menu.cpp | 4 ++-- Telegram/SourceFiles/calls/group/calls_volume_item.cpp | 2 +- Telegram/SourceFiles/calls/ui/calls_device_menu.cpp | 4 ++-- Telegram/SourceFiles/core/bank_card_click_handler.cpp | 2 +- Telegram/SourceFiles/core/phone_click_handler.cpp | 2 +- Telegram/SourceFiles/dialogs/ui/chat_search_in.cpp | 2 +- .../SourceFiles/history/view/history_view_translate_bar.cpp | 2 +- .../SourceFiles/info/profile/info_profile_phone_menu.cpp | 2 +- Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp | 2 +- Telegram/SourceFiles/media/player/media_player_dropdown.cpp | 2 +- Telegram/SourceFiles/menu/menu_item_rate_transcribe.cpp | 2 +- Telegram/SourceFiles/menu/menu_ttl.cpp | 2 +- .../SourceFiles/ui/chat/attach/attach_bot_downloads.cpp | 2 +- .../ui/controls/delete_message_context_action.cpp | 2 +- .../SourceFiles/ui/controls/who_reacted_context_action.cpp | 6 +++--- Telegram/lib_ui | 2 +- 17 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Telegram/SourceFiles/calls/group/calls_cover_item.cpp b/Telegram/SourceFiles/calls/group/calls_cover_item.cpp index 3121a78c58..4d8ddbb9ab 100644 --- a/Telegram/SourceFiles/calls/group/calls_cover_item.cpp +++ b/Telegram/SourceFiles/calls/group/calls_cover_item.cpp @@ -32,7 +32,7 @@ CoverItem::CoverItem( , _st(st) { setPointerCursor(false); - initResizeHook(parent->sizeValue()); + fitToMenuWidth(); enableMouseSelecting(); enableMouseSelecting(_cover.widget()); @@ -66,7 +66,7 @@ AboutItem::AboutItem( , _dummyAction(new QAction(parent)) { setPointerCursor(false); - initResizeHook(parent->sizeValue()); + fitToMenuWidth(); enableMouseSelecting(); enableMouseSelecting(_text.get()); diff --git a/Telegram/SourceFiles/calls/group/calls_group_menu.cpp b/Telegram/SourceFiles/calls/group/calls_group_menu.cpp index f34c22fb55..693811c2e5 100644 --- a/Telegram/SourceFiles/calls/group/calls_group_menu.cpp +++ b/Telegram/SourceFiles/calls/group/calls_group_menu.cpp @@ -128,7 +128,7 @@ JoinAsAction::JoinAsAction( + st::groupCallJoinAsPhotoSize + st::groupCallJoinAsPadding.bottom()) { setAcceptBoth(true); - initResizeHook(parent->sizeValue()); + fitToMenuWidth(); setClickedCallback(std::move(callback)); paintRequest( @@ -262,7 +262,7 @@ RecordingAction::RecordingAction( }, lifetime()); setAcceptBoth(true); - initResizeHook(parent->sizeValue()); + fitToMenuWidth(); setClickedCallback(std::move(callback)); paintRequest( diff --git a/Telegram/SourceFiles/calls/group/calls_volume_item.cpp b/Telegram/SourceFiles/calls/group/calls_volume_item.cpp index ae253f8c80..59e301f92a 100644 --- a/Telegram/SourceFiles/calls/group/calls_volume_item.cpp +++ b/Telegram/SourceFiles/calls/group/calls_volume_item.cpp @@ -65,7 +65,7 @@ MenuVolumeItem::MenuVolumeItem( _localMuted ? 0. : (startVolume / float(maxVolume)), Ui::Paint::ArcsAnimation::Direction::Right)) { - initResizeHook(parent->sizeValue()); + fitToMenuWidth(); enableMouseSelecting(); enableMouseSelecting(_slider.get()); diff --git a/Telegram/SourceFiles/calls/ui/calls_device_menu.cpp b/Telegram/SourceFiles/calls/ui/calls_device_menu.cpp index 52ca7a6b7a..6b32450756 100644 --- a/Telegram/SourceFiles/calls/ui/calls_device_menu.cpp +++ b/Telegram/SourceFiles/calls/ui/calls_device_menu.cpp @@ -78,7 +78,7 @@ Subsection::Subsection( , _dummyAction(Ui::CreateChild(parent)) { setPointerCursor(false); - initResizeHook(parent->sizeValue()); + fitToMenuWidth(); _text->resizeToWidth(st::callDeviceSelectionLabel.minWidth); _text->moveToLeft(st.itemPadding.left(), st.itemPadding.top()); @@ -110,7 +110,7 @@ Selector::Selector( , _dummyAction(Ui::CreateChild(parent)) { setPointerCursor(false); - initResizeHook(parent->sizeValue()); + fitToMenuWidth(); const auto padding = st.itemPadding; const auto group = std::make_shared(); diff --git a/Telegram/SourceFiles/core/bank_card_click_handler.cpp b/Telegram/SourceFiles/core/bank_card_click_handler.cpp index 3794aee960..03c605dc25 100644 --- a/Telegram/SourceFiles/core/bank_card_click_handler.cpp +++ b/Telegram/SourceFiles/core/bank_card_click_handler.cpp @@ -105,7 +105,7 @@ ResolveBankCardAction::ResolveBankCardAction( , _st(st) , _height(st::groupCallJoinAsPhotoSize) { setAcceptBoth(true); - initResizeHook(parent->sizeValue()); + fitToMenuWidth(); setStatus(Status::Loading); } diff --git a/Telegram/SourceFiles/core/phone_click_handler.cpp b/Telegram/SourceFiles/core/phone_click_handler.cpp index 95567c00b5..95f10964d0 100644 --- a/Telegram/SourceFiles/core/phone_click_handler.cpp +++ b/Telegram/SourceFiles/core/phone_click_handler.cpp @@ -92,7 +92,7 @@ ResolvePhoneAction::ResolvePhoneAction( , _height(rect::m::sum::v(st::groupCallJoinAsPadding) + st::groupCallJoinAsPhotoSize) { setAcceptBoth(true); - initResizeHook(parent->sizeValue()); + fitToMenuWidth(); setClickedCallback([=] { if (const auto peer = _peer.current()) { controller->showPeerInfo(peer); diff --git a/Telegram/SourceFiles/dialogs/ui/chat_search_in.cpp b/Telegram/SourceFiles/dialogs/ui/chat_search_in.cpp index 834e3f2f71..a9baa369c9 100644 --- a/Telegram/SourceFiles/dialogs/ui/chat_search_in.cpp +++ b/Telegram/SourceFiles/dialogs/ui/chat_search_in.cpp @@ -100,7 +100,7 @@ Action::Action( _text.setText(st::semiboldTextStyle, label); _icon->subscribeToUpdates([=] { update(); }); - initResizeHook(parent->sizeValue()); + fitToMenuWidth(); resolveMinWidth(); paintRequest( diff --git a/Telegram/SourceFiles/history/view/history_view_translate_bar.cpp b/Telegram/SourceFiles/history/view/history_view_translate_bar.cpp index 1510bfa56c..d935006a00 100644 --- a/Telegram/SourceFiles/history/view/history_view_translate_bar.cpp +++ b/Telegram/SourceFiles/history/view/history_view_translate_bar.cpp @@ -107,7 +107,7 @@ TwoTextAction::TwoTextAction( + _st.itemStyle.font->height + st::ttlItemTimerFont->height + st::ttlItemPadding.bottom()) { - initResizeHook(parent->sizeValue()); + fitToMenuWidth(); setClickedCallback(std::move(callback)); paintRequest( diff --git a/Telegram/SourceFiles/info/profile/info_profile_phone_menu.cpp b/Telegram/SourceFiles/info/profile/info_profile_phone_menu.cpp index bf0b92c1ee..7722885745 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_phone_menu.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_phone_menu.cpp @@ -95,7 +95,7 @@ TextItem::TextItem( }, lifetime()); _label->resizeToWidth(parent->width() - added); - initResizeHook(parent->sizeValue()); + fitToMenuWidth(); } not_null TextItem::action() const { diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp index e955500def..117606fd52 100644 --- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp +++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp @@ -665,7 +665,7 @@ BotAction::BotAction( + _st.itemStyle.font->height + _st.itemPadding.bottom()) { setAcceptBoth(false); - initResizeHook(parent->sizeValue()); + fitToMenuWidth(); setClickedCallback(std::move(callback)); _icon.move(_st.itemIconPosition); diff --git a/Telegram/SourceFiles/media/player/media_player_dropdown.cpp b/Telegram/SourceFiles/media/player/media_player_dropdown.cpp index 2c9572dfe6..12a29a72e1 100644 --- a/Telegram/SourceFiles/media/player/media_player_dropdown.cpp +++ b/Telegram/SourceFiles/media/player/media_player_dropdown.cpp @@ -95,7 +95,7 @@ SpeedSliderItem::SpeedSliderItem( + st.dropdown.menu.itemStyle.font->height + st.sliderPadding.bottom()) , _debounceTimer([=] { _debounced.fire(current()); }) { - initResizeHook(parent->sizeValue()); + fitToMenuWidth(); enableMouseSelecting(); enableMouseSelecting(_slider.get()); diff --git a/Telegram/SourceFiles/menu/menu_item_rate_transcribe.cpp b/Telegram/SourceFiles/menu/menu_item_rate_transcribe.cpp index 21dff2f47c..a3fc49a672 100644 --- a/Telegram/SourceFiles/menu/menu_item_rate_transcribe.cpp +++ b/Telegram/SourceFiles/menu/menu_item_rate_transcribe.cpp @@ -35,7 +35,7 @@ RateTranscribe::RateTranscribe( , _dummyAction(Ui::CreateChild(this)) { setAcceptBoth(true); - initResizeHook(popupMenu->menu()->sizeValue()); + fitToMenuWidth(); enableMouseSelecting(); diff --git a/Telegram/SourceFiles/menu/menu_ttl.cpp b/Telegram/SourceFiles/menu/menu_ttl.cpp index 26100e5e85..9c4db841f8 100644 --- a/Telegram/SourceFiles/menu/menu_ttl.cpp +++ b/Telegram/SourceFiles/menu/menu_ttl.cpp @@ -109,7 +109,7 @@ TextItem::TextItem( (s.height() - _label->height()) / 2); }, lifetime()); - initResizeHook(parent->sizeValue()); + fitToMenuWidth(); } not_null TextItem::action() const { diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_downloads.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_bot_downloads.cpp index c2bb2fafd5..a6e0045cc6 100644 --- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_downloads.cpp +++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_downloads.cpp @@ -69,7 +69,7 @@ Action::Action( + st::ttlItemTimerFont->height + st::ttlItemPadding.bottom()) { setAcceptBoth(true); - initResizeHook(parent->sizeValue()); + fitToMenuWidth(); setClickedCallback([=] { if (isEnabled()) { callback(DownloadsAction::Open); diff --git a/Telegram/SourceFiles/ui/controls/delete_message_context_action.cpp b/Telegram/SourceFiles/ui/controls/delete_message_context_action.cpp index a970a81623..e4b328b37b 100644 --- a/Telegram/SourceFiles/ui/controls/delete_message_context_action.cpp +++ b/Telegram/SourceFiles/ui/controls/delete_message_context_action.cpp @@ -83,7 +83,7 @@ ActionWithTimer::ActionWithTimer( + st::ttlItemTimerFont->height + st::ttlItemPadding.bottom()) { setAcceptBoth(true); - initResizeHook(parent->sizeValue()); + fitToMenuWidth(); setClickedCallback(std::move(callback)); paintRequest( diff --git a/Telegram/SourceFiles/ui/controls/who_reacted_context_action.cpp b/Telegram/SourceFiles/ui/controls/who_reacted_context_action.cpp index d03d5b9112..8583a7aba0 100644 --- a/Telegram/SourceFiles/ui/controls/who_reacted_context_action.cpp +++ b/Telegram/SourceFiles/ui/controls/who_reacted_context_action.cpp @@ -214,7 +214,7 @@ Action::Action( }; setAcceptBoth(true); - initResizeHook(parent->sizeValue()); + fitToMenuWidth(); std::move( content @@ -519,7 +519,7 @@ WhenAction::WhenAction( const auto parent = parentMenu->menu(); setAcceptBoth(true); - initResizeHook(parent->sizeValue()); + fitToMenuWidth(); std::move( content @@ -735,7 +735,7 @@ WhoReactedEntryAction::WhoReactedEntryAction( , _height(st::defaultWhoRead.photoSkip * 2 + st::defaultWhoRead.photoSize) { setAcceptBoth(true); - initResizeHook(parent->sizeValue()); + fitToMenuWidth(); setData(std::move(data)); paintRequest( diff --git a/Telegram/lib_ui b/Telegram/lib_ui index 81e3a112bf..6f64c263e7 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit 81e3a112bf31ae5665dca19aea7e5e9c803a0acb +Subproject commit 6f64c263e711e3f72772df9db852aebde28c634b