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

Removed App::wnd for opening about box.

Browse Source
This commit is contained in:
23rd
2021-02-03 05:55:01 +03:00
committed by John Preston
parent b4af805521
commit fb9a34a069
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1107,12 +1107,9 @@ void MainWindow::createGlobalMenu() {
tr::now, tr::now,
lt_telegram, lt_telegram,
qsl("Telegram")), qsl("Telegram")),
[] { [=] {
if (App::wnd() && App::wnd()->isHidden()) { ensureWindowShown();
App::wnd()->showFromTray(); controller().show(Box<AboutBox>());
}
Ui::show(Box<AboutBox>());
}); });
about->setMenuRole(QAction::AboutQtRole); about->setMenuRole(QAction::AboutQtRole);

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

@@ -691,12 +691,19 @@ void MainWindow::createGlobalMenu() {
}; };
auto main = psMainMenu.addMenu(qsl("Telegram")); auto main = psMainMenu.addMenu(qsl("Telegram"));
auto about = main->addAction(tr::lng_mac_menu_about_telegram(tr::now, lt_telegram, qsl("Telegram"))); {
connect(about, &QAction::triggered, about, [] { auto callback = [=] {
if (App::wnd() && App::wnd()->isHidden()) App::wnd()->showFromTray(); ensureWindowShown();
Ui::show(Box<AboutBox>()); controller().show(Box<AboutBox>());
}); };
about->setMenuRole(QAction::AboutQtRole); main->addAction(
tr::lng_mac_menu_about_telegram(
tr::now,
lt_telegram,
qsl("Telegram")),
std::move(callback))
->setMenuRole(QAction::AboutQtRole);
}
main->addSeparator(); main->addSeparator();
{ {