Fix focusing on the previously opened dialog didn't work

Placing modeless dialog A on top of modeless dialog B, then open dialog B again,
the expected behavior is B on top of A.
This commit is contained in:
Chocobo1 2017-05-30 14:00:00 +08:00 committed by sledgehammer999
commit 76b9b02177
No known key found for this signature in database
GPG key ID: 6E4A2D025B7CC9A2

View file

@ -976,7 +976,7 @@ void MainWindow::on_actionAbout_triggered()
{ {
// About dialog // About dialog
if (m_aboutDlg) if (m_aboutDlg)
m_aboutDlg->setFocus(); m_aboutDlg->activateWindow();
else else
m_aboutDlg = new about(this); m_aboutDlg = new about(this);
} }
@ -984,7 +984,7 @@ void MainWindow::on_actionAbout_triggered()
void MainWindow::on_actionStatistics_triggered() void MainWindow::on_actionStatistics_triggered()
{ {
if (m_statsDlg) if (m_statsDlg)
m_statsDlg->setFocus(); m_statsDlg->activateWindow();
else else
m_statsDlg = new StatsDialog(this); m_statsDlg = new StatsDialog(this);
} }
@ -1058,7 +1058,7 @@ void MainWindow::closeEvent(QCloseEvent *e)
void MainWindow::on_actionCreateTorrent_triggered() void MainWindow::on_actionCreateTorrent_triggered()
{ {
if (m_createTorrentDlg) if (m_createTorrentDlg)
m_createTorrentDlg->setFocus(); m_createTorrentDlg->activateWindow();
else else
m_createTorrentDlg = new TorrentCreatorDlg(this); m_createTorrentDlg = new TorrentCreatorDlg(this);
} }
@ -1485,7 +1485,7 @@ void MainWindow::createTrayIcon()
void MainWindow::on_actionOptions_triggered() void MainWindow::on_actionOptions_triggered()
{ {
if (m_options) if (m_options)
m_options->setFocus(); m_options->activateWindow();
else else
m_options = new OptionsDialog(this); m_options = new OptionsDialog(this);
} }