From 0783a682dcbad8565aced7de1fd7360351381939 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Wed, 3 Feb 2021 05:58:59 +0300 Subject: [PATCH] Removed App:wnd from Platform::MainWindow for macOS. --- .../SourceFiles/platform/mac/main_window_mac.mm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.mm b/Telegram/SourceFiles/platform/mac/main_window_mac.mm index 36a26926d0..6adde8c140 100644 --- a/Telegram/SourceFiles/platform/mac/main_window_mac.mm +++ b/Telegram/SourceFiles/platform/mac/main_window_mac.mm @@ -800,9 +800,10 @@ void MainWindow::createGlobalMenu() { std::move(callback)); } window->addSeparator(); - psShowTelegram = window->addAction(tr::lng_mac_menu_show(tr::now), App::wnd(), [=] { - showFromTray(); - }); + psShowTelegram = window->addAction( + tr::lng_mac_menu_show(tr::now), + this, + [=] { showFromTray(); }); updateGlobalMenu(); } @@ -864,7 +865,9 @@ void MainWindow::psMacClearFormat() { } void MainWindow::updateGlobalMenuHook() { - if (!App::wnd() || !positionInited()) return; + if (!positionInited()) { + return; + } auto focused = QApplication::focusWidget(); bool canUndo = false, canRedo = false, canCut = false, canCopy = false, canPaste = false, canDelete = false, canSelectAll = false; @@ -895,7 +898,7 @@ void MainWindow::updateGlobalMenuHook() { _canApplyMarkdown = canApplyMarkdown; - App::wnd()->updateIsActive(); + updateIsActive(); const auto logged = (sessionController() != nullptr); const auto inactive = !logged || controller().locked(); const auto support = logged && account().session().supportMode(); @@ -911,7 +914,7 @@ void MainWindow::updateGlobalMenuHook() { ForceDisabled(psAddContact, inactive); ForceDisabled(psNewGroup, inactive || support); ForceDisabled(psNewChannel, inactive || support); - ForceDisabled(psShowTelegram, App::wnd()->isActive()); + ForceDisabled(psShowTelegram, isActive()); ForceDisabled(psBold, !canApplyMarkdown); ForceDisabled(psItalic, !canApplyMarkdown);