RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removed App:wnd from Platform::MainWindow for macOS.

This commit is contained in:
23rd 2021-02-03 05:58:59 +03:00 committed by John Preston
parent fb9a34a069
commit 0783a682dc
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -800,9 +800,10 @@ void MainWindow::createGlobalMenu() {
std::move(callback)); std::move(callback));
} }
window->addSeparator(); window->addSeparator();
psShowTelegram = window->addAction(tr::lng_mac_menu_show(tr::now), App::wnd(), [=] { psShowTelegram = window->addAction(
showFromTray(); tr::lng_mac_menu_show(tr::now),
}); this,
[=] { showFromTray(); });
updateGlobalMenu(); updateGlobalMenu();
} }
@ -864,7 +865,9 @@ void MainWindow::psMacClearFormat() {
} }
void MainWindow::updateGlobalMenuHook() { void MainWindow::updateGlobalMenuHook() {
if (!App::wnd() || !positionInited()) return; if (!positionInited()) {
return;
}
auto focused = QApplication::focusWidget(); auto focused = QApplication::focusWidget();
bool canUndo = false, canRedo = false, canCut = false, canCopy = false, canPaste = false, canDelete = false, canSelectAll = false; bool canUndo = false, canRedo = false, canCut = false, canCopy = false, canPaste = false, canDelete = false, canSelectAll = false;
@ -895,7 +898,7 @@ void MainWindow::updateGlobalMenuHook() {
_canApplyMarkdown = canApplyMarkdown; _canApplyMarkdown = canApplyMarkdown;
App::wnd()->updateIsActive(); updateIsActive();
const auto logged = (sessionController() != nullptr); const auto logged = (sessionController() != nullptr);
const auto inactive = !logged || controller().locked(); const auto inactive = !logged || controller().locked();
const auto support = logged && account().session().supportMode(); const auto support = logged && account().session().supportMode();
@ -911,7 +914,7 @@ void MainWindow::updateGlobalMenuHook() {
ForceDisabled(psAddContact, inactive); ForceDisabled(psAddContact, inactive);
ForceDisabled(psNewGroup, inactive || support); ForceDisabled(psNewGroup, inactive || support);
ForceDisabled(psNewChannel, inactive || support); ForceDisabled(psNewChannel, inactive || support);
ForceDisabled(psShowTelegram, App::wnd()->isActive()); ForceDisabled(psShowTelegram, isActive());
ForceDisabled(psBold, !canApplyMarkdown); ForceDisabled(psBold, !canApplyMarkdown);
ForceDisabled(psItalic, !canApplyMarkdown); ForceDisabled(psItalic, !canApplyMarkdown);