From f620128dac607d99e6ac75168b87db413f89cd45 Mon Sep 17 00:00:00 2001 From: Techjar Date: Wed, 4 Jul 2018 16:41:56 -0400 Subject: [PATCH] Qt: Unparent NetPlay dialog from main window This should make the NetPlay dialog appear as a separate window in the taskbar on most systems, which makes more sense than a parented dialog as the user will leave it open for an extended period. --- Source/Core/DolphinQt2/MainWindow.cpp | 3 ++- Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp | 2 ++ Source/Core/DolphinQt2/NetPlay/NetPlayDialog.h | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Source/Core/DolphinQt2/MainWindow.cpp b/Source/Core/DolphinQt2/MainWindow.cpp index e621d2ac2c..8bb919079b 100644 --- a/Source/Core/DolphinQt2/MainWindow.cpp +++ b/Source/Core/DolphinQt2/MainWindow.cpp @@ -156,6 +156,7 @@ MainWindow::MainWindow(std::unique_ptr boot_parameters) : QMainW MainWindow::~MainWindow() { m_render_widget->deleteLater(); + m_netplay_dialog->deleteLater(); ShutdownControllers(); QSettings& settings = Settings::GetQSettings(); @@ -1037,7 +1038,7 @@ void MainWindow::BootWiiSystemMenu() void MainWindow::NetPlayInit() { m_netplay_setup_dialog = new NetPlaySetupDialog(this); - m_netplay_dialog = new NetPlayDialog(this); + m_netplay_dialog = new NetPlayDialog; connect(m_netplay_dialog, &NetPlayDialog::Boot, this, [this](const QString& path) { StartGame(path); }); diff --git a/Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp b/Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp index bee6806b29..69c23fc892 100644 --- a/Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp +++ b/Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp @@ -42,6 +42,7 @@ #include "DolphinQt2/NetPlay/PadMappingDialog.h" #include "DolphinQt2/QtUtils/QueueOnObject.h" #include "DolphinQt2/QtUtils/RunOnObject.h" +#include "DolphinQt2/Resources.h" #include "DolphinQt2/Settings.h" #include "VideoCommon/VideoConfig.h" @@ -52,6 +53,7 @@ NetPlayDialog::NetPlayDialog(QWidget* parent) setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setWindowTitle(tr("NetPlay")); + setWindowIcon(Resources::GetAppIcon()); m_pad_mapping = new PadMappingDialog(this); m_md5_dialog = new MD5Dialog(this); diff --git a/Source/Core/DolphinQt2/NetPlay/NetPlayDialog.h b/Source/Core/DolphinQt2/NetPlay/NetPlayDialog.h index b17a4acea2..b62e689049 100644 --- a/Source/Core/DolphinQt2/NetPlay/NetPlayDialog.h +++ b/Source/Core/DolphinQt2/NetPlay/NetPlayDialog.h @@ -30,7 +30,7 @@ class NetPlayDialog : public QDialog, public NetPlayUI { Q_OBJECT public: - explicit NetPlayDialog(QWidget* parent); + explicit NetPlayDialog(QWidget* parent = nullptr); ~NetPlayDialog(); void show(std::string nickname, bool use_traversal);