From 202c36646cc8a57e19128ab9c9e003a1a2de1672 Mon Sep 17 00:00:00 2001
From: WarmUpTill <19472752+WarmUpTill@users.noreply.github.com>
Date: Sun, 9 Mar 2025 16:21:52 +0100
Subject: [PATCH] Fix UI issues when opening ItemSettingsDialogs

Some widgets were displayed incorrectly if the parent of the dialog
window is not the main settings window
---
 lib/queue/action-queue-tab.cpp       | 6 +++---
 lib/variables/variable-tab.cpp       | 6 +++---
 plugins/base/utils/websocket-tab.cpp | 4 ++--
 plugins/twitch/twitch-tab.cpp        | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/queue/action-queue-tab.cpp b/lib/queue/action-queue-tab.cpp
index 31559c87..a1e13250 100644
--- a/lib/queue/action-queue-tab.cpp
+++ b/lib/queue/action-queue-tab.cpp
@@ -40,8 +40,8 @@ ActionQueueTable *ActionQueueTable::Create()
 void ActionQueueTable::Add()
 {
 	auto newQueue = std::make_shared<ActionQueue>();
-	auto accepted =
-		ActionQueueSettingsDialog::AskForSettings(this, *newQueue);
+	auto accepted = ActionQueueSettingsDialog::AskForSettings(
+		GetSettingsWindow(), *newQueue);
 	if (!accepted) {
 		return;
 	}
@@ -124,7 +124,7 @@ static void openSettingsDialog()
 
 	auto oldName = queue->Name();
 	bool accepted = ActionQueueSettingsDialog::AskForSettings(
-		tabWidget->Table(), *queue.get());
+		GetSettingsWindow(), *queue.get());
 	if (accepted && oldName != queue->Name()) {
 		ActionQueueSignalManager::Instance()->Rename(
 			QString::fromStdString(oldName),
diff --git a/lib/variables/variable-tab.cpp b/lib/variables/variable-tab.cpp
index 35689414..580ea208 100644
--- a/lib/variables/variable-tab.cpp
+++ b/lib/variables/variable-tab.cpp
@@ -43,8 +43,8 @@ VariableTable *VariableTable::Create()
 void VariableTable::Add()
 {
 	auto newVariable = std::make_shared<Variable>();
-	auto accepted =
-		VariableSettingsDialog::AskForSettings(this, *newVariable);
+	auto accepted = VariableSettingsDialog::AskForSettings(
+		GetSettingsWindow(), *newVariable);
 	if (!accepted) {
 		return;
 	}
@@ -184,7 +184,7 @@ static void openSettingsDialog()
 
 	auto oldName = variable->Name();
 	bool accepted = VariableSettingsDialog::AskForSettings(
-		tabWidget->Table(), *variable.get());
+		GetSettingsWindow(), *variable.get());
 	if (accepted && oldName != variable->Name()) {
 		VariableSignalManager::Instance()->Rename(
 			QString::fromStdString(oldName),
diff --git a/plugins/base/utils/websocket-tab.cpp b/plugins/base/utils/websocket-tab.cpp
index 1de6da51..7d11289f 100644
--- a/plugins/base/utils/websocket-tab.cpp
+++ b/plugins/base/utils/websocket-tab.cpp
@@ -40,7 +40,7 @@ void WSConnectionsTable::Add()
 {
 	auto newConnection = std::make_shared<WSConnection>();
 	auto accepted = WSConnectionSettingsDialog::AskForSettings(
-		this, *newConnection);
+		GetSettingsWindow(), *newConnection);
 	if (!accepted) {
 		return;
 	}
@@ -143,7 +143,7 @@ static void openSettingsDialog()
 
 	auto oldName = connection->Name();
 	bool accepted = WSConnectionSettingsDialog::AskForSettings(
-		tabWidget->Table(), *connection.get());
+		GetSettingsWindow(), *connection.get());
 	if (accepted && oldName != connection->Name()) {
 		ConnectionSelectionSignalManager::Instance()->Rename(
 			QString::fromStdString(oldName),
diff --git a/plugins/twitch/twitch-tab.cpp b/plugins/twitch/twitch-tab.cpp
index 3866c991..771c0772 100644
--- a/plugins/twitch/twitch-tab.cpp
+++ b/plugins/twitch/twitch-tab.cpp
@@ -44,8 +44,8 @@ TwitchConnectionsTable *TwitchConnectionsTable::Create()
 void TwitchConnectionsTable::Add()
 {
 	auto newToken = std::make_shared<TwitchToken>();
-	auto accepted =
-		TwitchTokenSettingsDialog::AskForSettings(this, *newToken);
+	auto accepted = TwitchTokenSettingsDialog::AskForSettings(
+		GetSettingsWindow(), *newToken);
 	if (!accepted) {
 		return;
 	}
@@ -139,7 +139,7 @@ static void openSettingsDialog()
 		return;
 	}
 
-	TwitchTokenSettingsDialog::AskForSettings(tabWidget->Table(),
+	TwitchTokenSettingsDialog::AskForSettings(GetSettingsWindow(),
 						  *token.get());
 }