Close the current window instead of the main window from the menu bar

Systems with native menu bars show the same menu bar for all child windows. As a result, you cannot assume that the menu bar's parent (the `MainWindow`) will be the window in focus.
This commit is contained in:
Kenneth Chew
2022-04-16 02:07:29 -04:00
parent 1049507b3f
commit e59d3a339f
3 changed files with 9 additions and 2 deletions

View File

@ -615,8 +615,7 @@ public:
closeAct = new QAction(tr("Close &Window"), MainWindow);
closeAct->setShortcut(QKeySequence::Close);
closeAct->setStatusTip(tr("Close the current window"));
// FIXME: currently this always closes the main window, even if it is not currently the window in focus
connect(closeAct, &QAction::triggered, MainWindow, &MainWindow::close);
connect(closeAct, &QAction::triggered, APPLICATION, &Application::closeCurrentWindow);
undoAct = new QAction(tr("&Undo"), MainWindow);
undoAct->setShortcuts(QKeySequence::Undo);