mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 06:35:14 +00:00
Code Issues Releases Wiki Activity

Display active feed state in dialogs list.

Browse Source
This commit is contained in:
John Preston
2018-01-22 19:42:25 +03:00
parent 840b42934b
commit 47ad5ea98a
29 changed files with 381 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Telegram/SourceFiles/window/window_peer_menu.cpp
View File

@@ -158,7 +158,7 @@ Filler::Filler(
bool Filler::showInfo() {
if (_source == PeerMenuSource::Profile || _peer->isSelf()) {
return false;
} else if (_controller->activePeer.current() != _peer) {
} else if (_controller->activeChatCurrent().peer() != _peer) {
return true;
} else if (!Adaptive::ThreeColumn()) {
return true;
@@ -626,14 +626,15 @@ base::lambda<void()> DeleteAndLeaveHandler(not_null<PeerData*> peer) {
: st::attentionBoxButton;
auto callback = [peer] {
Ui::hideLayer();
if (App::wnd()->controller()->activePeer.current() == peer) {
const auto controller = App::wnd()->controller();
if (controller->activeChatCurrent().peer() == peer) {
Ui::showChatsList();
}
if (peer->isUser()) {
App::main()->deleteConversation(peer);
} else if (auto chat = peer->asChat()) {
} else if (const auto chat = peer->asChat()) {
App::main()->deleteAndExit(chat);
} else if (auto channel = peer->asChannel()) {
} else if (const auto channel = peer->asChannel()) {
// Don't delete old history by default,
// because Android app doesn't.
//