From 6dd5a3a8669076cb5be588d6e9cefa4f7cf6ac27 Mon Sep 17 00:00:00 2001 From: aldelaro5 Date: Fri, 18 May 2018 01:17:30 -0400 Subject: [PATCH] Qt/CheatWarningWidget: properly supply a parent for the widget Because it wasn't parented properly, it would show briefly the widget in its own window when creating an ARCodeWidget or a GeckoCodeWidget which would occur when accessing the game properties page or when the state changes to pause/running. --- Source/Core/DolphinQt2/Config/ARCodeWidget.cpp | 2 +- Source/Core/DolphinQt2/Config/CheatWarningWidget.cpp | 5 +++-- Source/Core/DolphinQt2/Config/CheatWarningWidget.h | 2 +- Source/Core/DolphinQt2/Config/GeckoCodeWidget.cpp | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) mode change 100644 => 100755 Source/Core/DolphinQt2/Config/CheatWarningWidget.cpp mode change 100644 => 100755 Source/Core/DolphinQt2/Config/CheatWarningWidget.h mode change 100644 => 100755 Source/Core/DolphinQt2/Config/GeckoCodeWidget.cpp diff --git a/Source/Core/DolphinQt2/Config/ARCodeWidget.cpp b/Source/Core/DolphinQt2/Config/ARCodeWidget.cpp index 001ebfd219..e1ea8ad50d 100644 --- a/Source/Core/DolphinQt2/Config/ARCodeWidget.cpp +++ b/Source/Core/DolphinQt2/Config/ARCodeWidget.cpp @@ -40,7 +40,7 @@ ARCodeWidget::ARCodeWidget(const UICommon::GameFile& game, bool restart_required void ARCodeWidget::CreateWidgets() { - m_warning = new CheatWarningWidget(m_game_id, m_restart_required); + m_warning = new CheatWarningWidget(m_game_id, m_restart_required, this); m_code_list = new QListWidget; m_code_add = new QPushButton(tr("&Add New Code...")); m_code_edit = new QPushButton(tr("&Edit Code...")); diff --git a/Source/Core/DolphinQt2/Config/CheatWarningWidget.cpp b/Source/Core/DolphinQt2/Config/CheatWarningWidget.cpp old mode 100644 new mode 100755 index 590c0493e4..e381f456ec --- a/Source/Core/DolphinQt2/Config/CheatWarningWidget.cpp +++ b/Source/Core/DolphinQt2/Config/CheatWarningWidget.cpp @@ -14,8 +14,9 @@ #include "Core/Core.h" #include "DolphinQt2/Settings.h" -CheatWarningWidget::CheatWarningWidget(const std::string& game_id, bool restart_required) - : m_game_id(game_id), m_restart_required(restart_required) +CheatWarningWidget::CheatWarningWidget(const std::string& game_id, bool restart_required, + QWidget* parent) + : QWidget(parent), m_game_id(game_id), m_restart_required(restart_required) { CreateWidgets(); ConnectWidgets(); diff --git a/Source/Core/DolphinQt2/Config/CheatWarningWidget.h b/Source/Core/DolphinQt2/Config/CheatWarningWidget.h old mode 100644 new mode 100755 index bb9fd2f10a..2ae15850f0 --- a/Source/Core/DolphinQt2/Config/CheatWarningWidget.h +++ b/Source/Core/DolphinQt2/Config/CheatWarningWidget.h @@ -15,7 +15,7 @@ class CheatWarningWidget : public QWidget { Q_OBJECT public: - explicit CheatWarningWidget(const std::string& game_id, bool restart_required); + explicit CheatWarningWidget(const std::string& game_id, bool restart_required, QWidget* parent); signals: void OpenCheatEnableSettings(); diff --git a/Source/Core/DolphinQt2/Config/GeckoCodeWidget.cpp b/Source/Core/DolphinQt2/Config/GeckoCodeWidget.cpp old mode 100644 new mode 100755 index 848479ee03..6842385573 --- a/Source/Core/DolphinQt2/Config/GeckoCodeWidget.cpp +++ b/Source/Core/DolphinQt2/Config/GeckoCodeWidget.cpp @@ -43,7 +43,7 @@ GeckoCodeWidget::GeckoCodeWidget(const UICommon::GameFile& game, bool restart_re void GeckoCodeWidget::CreateWidgets() { - m_warning = new CheatWarningWidget(m_game_id, m_restart_required); + m_warning = new CheatWarningWidget(m_game_id, m_restart_required, this); m_code_list = new QListWidget; m_name_label = new QLabel; m_creator_label = new QLabel;