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

Move terms lock from Core::App to Session.

Browse Source
This commit is contained in:
John Preston
2020-06-24 11:56:16 +04:00
parent 30c82bb2e0
commit e7b8a52278
19 changed files with 233 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Telegram/SourceFiles/platform/linux/main_window_linux.cpp
View File

@@ -23,6 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "boxes/about_box.h"
#include "lang/lang_keys.h"
#include "storage/localstorage.h"
#include "window/window_controller.h"
#include "window/window_session_controller.h"
#include "ui/widgets/input_fields.h"
#include "facades.h"
@@ -1027,10 +1028,9 @@ void MainWindow::updateGlobalMenuHook() {
}
App::wnd()->updateIsActive();
const auto logged = account().sessionExists();
const auto locked = Core::App().locked();
const auto inactive = !logged || locked;
const auto inactive = !logged || controller().locked();
const auto support = logged && account().session().supportMode();
ForceDisabled(psLogout, !logged && !locked);
ForceDisabled(psLogout, !logged && !Core::App().passcodeLocked());
ForceDisabled(psUndo, !canUndo);
ForceDisabled(psRedo, !canRedo);
ForceDisabled(psCut, !canCut);

6
Telegram/SourceFiles/platform/mac/main_window_mac.mm
View File

@@ -24,6 +24,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "storage/localstorage.h"
#include "window/notifications_manager_default.h"
#include "window/window_session_controller.h"
#include "window/window_controller.h"
#include "window/themes/window_theme.h"
#include "platform/mac/mac_touchbar.h"
#include "platform/platform_notifications_manager.h"
@@ -835,10 +836,9 @@ void MainWindow::updateGlobalMenuHook() {
}
App::wnd()->updateIsActive();
const auto logged = account().sessionExists();
const auto locked = Core::App().locked();
const auto inactive = !logged || locked;
const auto inactive = !logged || controller().locked();
const auto support = logged && account().session().supportMode();
ForceDisabled(psLogout, !logged && !locked);
ForceDisabled(psLogout, !logged && !Core::App().passcodeLocked());
ForceDisabled(psUndo, !canUndo);
ForceDisabled(psRedo, !canRedo);
ForceDisabled(psCut, !canCut);