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

Removed App::wnd for opening about box.

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
Show Stats 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,
lt_telegram,
qsl("Telegram")),
[] {
if (App::wnd() && App::wnd()->isHidden()) {
App::wnd()->showFromTray();
}
Ui::show(Box<AboutBox>());
[=] {
ensureWindowShown();
controller().show(Box<AboutBox>());
});
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 about = main->addAction(tr::lng_mac_menu_about_telegram(tr::now, lt_telegram, qsl("Telegram")));
connect(about, &QAction::triggered, about, [] {
if (App::wnd() && App::wnd()->isHidden()) App::wnd()->showFromTray();
Ui::show(Box<AboutBox>());
});
about->setMenuRole(QAction::AboutQtRole);
{
auto callback = [=] {
ensureWindowShown();
controller().show(Box<AboutBox>());
};
main->addAction(
tr::lng_mac_menu_about_telegram(
tr::now,
lt_telegram,
qsl("Telegram")),
std::move(callback))
->setMenuRole(QAction::AboutQtRole);
}
main->addSeparator();
{