mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-09-05 00:46:08 +00:00
Code Issues Releases Wiki Activity

Application->Sandbox, Messenger->Application.

Browse Source
This commit is contained in:
John Preston
2019-01-21 17:42:21 +04:00
parent 4111da1dd0
commit a70e72f75d
117 changed files with 1363 additions and 1239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Telegram/SourceFiles/window/notifications_manager.cpp
View File

@@ -18,9 +18,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_session.h"
#include "data/data_channel.h"
#include "window/window_controller.h"
#include "core/application.h"
#include "mainwindow.h"
#include "mainwidget.h"
#include "messenger.h"
#include "apiwrap.h"
#include "auth_session.h"
@@ -383,7 +383,7 @@ void System::updateAll() {
}
Manager::DisplayOptions Manager::getNotificationOptions(HistoryItem *item) {
const auto hideEverything = Messenger::Instance().locked()
const auto hideEverything = Core::App().locked()
|| Global::ScreenIsLocked();
DisplayOptions result;
@@ -399,7 +399,7 @@ void Manager::notificationActivated(PeerId peerId, MsgId msgId) {
auto history = Auth().data().history(peerId);
window->showFromTray();
window->reActivateWindow();
if (Messenger::Instance().locked()) {
if (Core::App().locked()) {
window->setInnerFocus();
system()->clearAll();
} else {