From 4121c99f3652d128e8dc7a4d483db99881a64f17 Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 3 Mar 2025 11:42:10 +0400 Subject: [PATCH] Allow folders submenu to have a scroll. --- Telegram/SourceFiles/boxes/boxes.style | 7 +++++++ Telegram/SourceFiles/boxes/choose_filter_box.cpp | 2 +- Telegram/SourceFiles/dialogs/dialogs.style | 4 ---- Telegram/SourceFiles/window/window_peer_menu.cpp | 1 + Telegram/lib_ui | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style index 90e59cd78a..fc34213942 100644 --- a/Telegram/SourceFiles/boxes/boxes.style +++ b/Telegram/SourceFiles/boxes/boxes.style @@ -1127,3 +1127,10 @@ profileQrBackgroundRadius: 12px; profileQrIcon: icon{{ "qr_mini", windowActiveTextFg }}; profileQrBackgroundMargins: margins(36px, 12px, 36px, 12px); profileQrBackgroundPadding: margins(0px, 24px, 0px, 24px); + +foldersMenu: PopupMenu(popupMenuWithIcons) { + maxHeight: 320px; + menu: Menu(menuWithIcons) { + itemPadding: margins(54px, 8px, 44px, 8px); + } +} diff --git a/Telegram/SourceFiles/boxes/choose_filter_box.cpp b/Telegram/SourceFiles/boxes/choose_filter_box.cpp index 685ef547f5..7448332d3a 100644 --- a/Telegram/SourceFiles/boxes/choose_filter_box.cpp +++ b/Telegram/SourceFiles/boxes/choose_filter_box.cpp @@ -290,7 +290,7 @@ void FillChooseFilterMenu( const auto title = filter.title(); auto item = base::make_unique_q( menu.get(), - st::foldersMenu, + menu->st().menu, Ui::Menu::CreateAction( menu.get(), Ui::Text::FixAmpersandInAction(title.text.text), diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style index f2ff4723ce..4027da23ee 100644 --- a/Telegram/SourceFiles/dialogs/dialogs.style +++ b/Telegram/SourceFiles/dialogs/dialogs.style @@ -789,7 +789,3 @@ dialogsPopularAppsPadding: margins(10px, 8px, 10px, 12px); dialogsPopularAppsAbout: FlatLabel(boxDividerLabel) { minWidth: 128px; } - -foldersMenu: Menu(menuWithIcons) { - itemPadding: margins(54px, 8px, 44px, 8px); -} diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp index 634c3c6f9d..5e131bce8e 100644 --- a/Telegram/SourceFiles/window/window_peer_menu.cpp +++ b/Telegram/SourceFiles/window/window_peer_menu.cpp @@ -633,6 +633,7 @@ void Filler::addToggleFolder() { .fillSubmenu = [&](not_null menu) { FillChooseFilterMenu(controller, menu, history); }, + .submenuSt = &st::foldersMenu, }); } diff --git a/Telegram/lib_ui b/Telegram/lib_ui index cfecbd3df4..da0d634ec3 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit cfecbd3df4c1d0bfba3d708dfb49387c8ae2127b +Subproject commit da0d634ec373d8ba0b8f66f3381a87e43edffdf2