ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt:Mac: Make sure settings windows are raised when requested

This commit is contained in:
TellowKrinkle 2023-07-15 17:22:06 -05:00 committed by TellowKrinkle
parent 807db91140
commit 433612cde0
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pcsx2-qt/MainWindow.cpp
View File

@ -2134,7 +2134,11 @@ SettingsDialog* MainWindow::getSettingsDialog()
connect(m_settings_dialog->getInterfaceSettingsWidget(), &InterfaceSettingsWidget::languageChanged, this, [this]() { connect(m_settings_dialog->getInterfaceSettingsWidget(), &InterfaceSettingsWidget::languageChanged, this, [this]() {
// reopen settings dialog after it applies // reopen settings dialog after it applies
updateLanguage(); updateLanguage();
g_main_window->doSettings("Interface"); // If you doSettings now, on macOS, the window will somehow end up underneath the main window that was created above
// Delay it slightly...
QtHost::RunOnUIThread([]{
g_main_window->doSettings("Interface");
});
}); });
} }
@ -2144,7 +2148,11 @@ SettingsDialog* MainWindow::getSettingsDialog()
void MainWindow::doSettings(const char* category /* = nullptr */) void MainWindow::doSettings(const char* category /* = nullptr */)
{ {
SettingsDialog* dlg = getSettingsDialog(); SettingsDialog* dlg = getSettingsDialog();
if (!dlg->isVisible()) if (dlg->isVisible())
{
dlg->raise();
}
else
{ {
dlg->setModal(false); dlg->setModal(false);
dlg->show(); dlg->show();