From dde36183ce4c1532e216e56eac2d41f5da134d41 Mon Sep 17 00:00:00 2001
From: BruebachL <44814898+BruebachL@users.noreply.github.com>
Date: Fri, 5 Dec 2025 23:27:27 +0100
Subject: [PATCH] [VDE] Proper parent lookup syncs group-by box again (#6396)

* [VDE] Proper parent lookup syncs group-by box again

* [VDE] Proper lib inclusion.

* [VDE] Lint.
---
 .../visual_deck_display_options_widget.cpp    | 30 +++++++++----------
 .../libcockatrice/utility/qt_utils.h          | 20 +++++++++++++
 2 files changed, 34 insertions(+), 16 deletions(-)
 create mode 100644 libcockatrice_utility/libcockatrice/utility/qt_utils.h

diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp
index c190038a5..b169e73cb 100644
--- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp
@@ -2,7 +2,9 @@
 
 #include "../tabs/visual_deck_editor/tab_deck_editor_visual.h"
 
-VisualDeckDisplayOptionsWidget::VisualDeckDisplayOptionsWidget(QWidget *parent)
+#include <libcockatrice/utility/qt_utils.h>
+
+VisualDeckDisplayOptionsWidget::VisualDeckDisplayOptionsWidget(QWidget *parent) : QWidget(parent)
 {
     groupAndSortLayout = new QHBoxLayout(this);
     groupAndSortLayout->setAlignment(Qt::AlignLeft);
@@ -11,23 +13,19 @@ VisualDeckDisplayOptionsWidget::VisualDeckDisplayOptionsWidget(QWidget *parent)
     groupByLabel = new QLabel(this);
 
     groupByComboBox = new QComboBox(this);
-    if (auto visualDeckEditorWidget = qobject_cast<VisualDeckEditorWidget *>(parent)) {
-        if (auto tabWidget = qobject_cast<TabDeckEditorVisualTabWidget *>(visualDeckEditorWidget)) {
-            // Inside a central widget QWidget container inside TabDeckEditorVisual
-            if (auto tab = qobject_cast<TabDeckEditorVisual *>(tabWidget->parent()->parent())) {
-                auto originalBox = tab->getDeckDockWidget()->getGroupByComboBox();
-                groupByComboBox->setModel(originalBox->model());
-                groupByComboBox->setModelColumn(originalBox->modelColumn());
 
-                // Original -> clone
-                connect(originalBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
-                        [this](int index) { groupByComboBox->setCurrentIndex(index); });
+    if (auto tab = QtUtils::findParentOfType<TabDeckEditorVisual>(this)) {
+        auto originalBox = tab->getDeckDockWidget()->getGroupByComboBox();
+        groupByComboBox->setModel(originalBox->model());
+        groupByComboBox->setModelColumn(originalBox->modelColumn());
 
-                // Clone -> original
-                connect(groupByComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
-                        [originalBox](int index) { originalBox->setCurrentIndex(index); });
-            }
-        }
+        // Original -> clone
+        connect(originalBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
+                [this](int index) { groupByComboBox->setCurrentIndex(index); });
+
+        // Clone -> original
+        connect(groupByComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
+                [originalBox](int index) { originalBox->setCurrentIndex(index); });
     } else {
         groupByComboBox->addItem(
             tr(qPrintable(DeckListModelGroupCriteria::toString(DeckListModelGroupCriteria::MAIN_TYPE))),
diff --git a/libcockatrice_utility/libcockatrice/utility/qt_utils.h b/libcockatrice_utility/libcockatrice/utility/qt_utils.h
new file mode 100644
index 000000000..855cc8b18
--- /dev/null
+++ b/libcockatrice_utility/libcockatrice/utility/qt_utils.h
@@ -0,0 +1,20 @@
+#ifndef COCKATRICE_QT_UTILS_H
+#define COCKATRICE_QT_UTILS_H
+#include <QObject>
+
+namespace QtUtils
+{
+template <typename T> T *findParentOfType(const QObject *obj)
+{
+    const QObject *p = obj ? obj->parent() : nullptr;
+    while (p) {
+        if (auto casted = qobject_cast<T *>(const_cast<QObject *>(p))) {
+            return casted;
+        }
+        p = p->parent();
+    }
+    return nullptr;
+}
+} // namespace QtUtils
+
+#endif // COCKATRICE_QT_UTILS_H