From 48ad171a29a2d518879375d9713f44a26be3ac0d Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 25 Apr 2019 12:36:31 +0400 Subject: [PATCH] Clear chats list context menu a bit. --- .../SourceFiles/window/window_peer_menu.cpp | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp index 6c6ae75a75..c0443c3755 100644 --- a/Telegram/SourceFiles/window/window_peer_menu.cpp +++ b/Telegram/SourceFiles/window/window_peer_menu.cpp @@ -55,7 +55,7 @@ private: bool showInfo(); void addPinToggle(); void addInfo(); - void addSearch(); + //void addSearch(); void addToggleUnreadMark(); void addToggleArchive(); void addUserActions(not_null user); @@ -178,7 +178,9 @@ Filler::Filler( } bool Filler::showInfo() { - if (_source == PeerMenuSource::Profile || _peer->isSelf()) { + if (_source == PeerMenuSource::Profile + || _source == PeerMenuSource::ChatsList + || _peer->isSelf()) { return false; } else if (_controller->activeChatCurrent().peer() != _peer) { return true; @@ -231,11 +233,11 @@ void Filler::addInfo() { }); } -void Filler::addSearch() { - _addAction(lang(lng_profile_search_messages), [peer = _peer] { - App::main()->searchInChat(peer->owner().history(peer)); - }); -} +//void Filler::addSearch() { +// _addAction(lang(lng_profile_search_messages), [peer = _peer] { +// App::main()->searchInChat(peer->owner().history(peer)); +// }); +//} void Filler::addToggleUnreadMark() { const auto peer = _peer; @@ -370,7 +372,9 @@ void Filler::addUserActions(not_null user) { _addAction( lang(lng_profile_clear_history), ClearHistoryHandler(user)); - if (!user->isInaccessible() && user != Auth().user()) { + if (!user->isInaccessible() + && user != Auth().user() + && _source != PeerMenuSource::ChatsList) { addBlockUser(user); } } @@ -489,7 +493,7 @@ void Filler::fill() { PeerMenuAddMuteAction(_peer, _addAction); } if (_source == PeerMenuSource::ChatsList) { - addSearch(); + //addSearch(); addToggleUnreadMark(); }