From abe83ccb8f4de2445a033bcf453274a1ea0d25e8 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Thu, 11 Apr 2024 20:37:10 +0300 Subject: [PATCH] Moved inaccessible groups in box for user's own groups to sub-list. Fixed #27729. --- Telegram/SourceFiles/ui/menu_icons.style | 1 + .../window/window_main_menu_helpers.cpp | 51 +++++++++++++++---- 2 files changed, 43 insertions(+), 9 deletions(-) diff --git a/Telegram/SourceFiles/ui/menu_icons.style b/Telegram/SourceFiles/ui/menu_icons.style index 862caf79d..4ec165b62 100644 --- a/Telegram/SourceFiles/ui/menu_icons.style +++ b/Telegram/SourceFiles/ui/menu_icons.style @@ -151,6 +151,7 @@ menuIconAsTopics: icon {{ "menu/mode_topics", menuIconColor }}; menuIconAsMessages: icon {{ "menu/mode_messages", menuIconColor }}; menuIconTagFilter: icon{{ "menu/tag_filter", menuIconColor }}; menuIconTagRename: icon{{ "menu/tag_rename", menuIconColor }}; +menuIconGroupsHide: icon {{ "menu/hide_members", menuIconColor }}; menuIconTTLAny: icon {{ "menu/auto_delete_plain", menuIconColor }}; menuIconTTLAnyTextPosition: point(11px, 22px); diff --git a/Telegram/SourceFiles/window/window_main_menu_helpers.cpp b/Telegram/SourceFiles/window/window_main_menu_helpers.cpp index 88c0af421..b70fb833a 100644 --- a/Telegram/SourceFiles/window/window_main_menu_helpers.cpp +++ b/Telegram/SourceFiles/window/window_main_menu_helpers.cpp @@ -27,10 +27,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/rect.h" #include "ui/widgets/popup_menu.h" #include "ui/widgets/tooltip.h" +#include "ui/wrap/slide_wrap.h" #include "window/window_controller.h" #include "window/window_session_controller.h" -#include "styles/style_chat.h" // popupMenuExpandedSeparator -#include "styles/style_info.h" // infoTopBarMenu +#include "styles/style_chat.h" +#include "styles/style_info.h" #include "styles/style_menu_icons.h" #include "styles/style_window.h" @@ -177,7 +178,9 @@ not_null AddMyChannelsBox( const auto count = c ? c->membersCount() : g->count; _status.setText( st::defaultTextStyle, - !p->username().isEmpty() + (g && !g->amIn()) + ? tr::lng_chat_status_unaccessible(tr::now) + : !p->username().isEmpty() ? ('@' + p->username()) : (count > 0) ? ((c && !c->isMegagroup()) @@ -219,10 +222,11 @@ not_null AddMyChannelsBox( }; - const auto add = [&](not_null peer) { - const auto row = box->addRow( - object_ptr