From b66743c83c7f5b5dcbb9a239ece3ec611aa499f9 Mon Sep 17 00:00:00 2001
From: RickyRister <42636155+RickyRister@users.noreply.github.com>
Date: Mon, 11 May 2026 20:23:12 -0700
Subject: [PATCH] [DeckEditor] Refactor searchEdit highlighting after add card
 (#6874)

* [DeckEditor] Refactor searchEdit highlighting after add card

* make searchEdit private
---
 .../deck_editor/deck_editor_card_database_dock_widget.cpp  | 4 ----
 .../deck_editor/deck_editor_card_database_dock_widget.h    | 1 -
 .../deck_editor/deck_editor_database_display_widget.cpp    | 7 +++++++
 .../deck_editor/deck_editor_database_display_widget.h      | 4 +++-
 .../interface/widgets/tabs/abstract_tab_deck_editor.cpp    | 2 --
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp
index bacebe385..f2a2ab4ea 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp
@@ -58,7 +58,3 @@ void DeckEditorCardDatabaseDockWidget::clearAllDatabaseFilters()
 {
     databaseDisplayWidget->clearAllDatabaseFilters();
 }
-void DeckEditorCardDatabaseDockWidget::highlightAllSearchEdit()
-{
-    databaseDisplayWidget->searchEdit->setSelection(0, databaseDisplayWidget->searchEdit->text().length());
-}
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.h
index 6ad442075..bff9ee36f 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.h
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.h
@@ -23,7 +23,6 @@ public:
 public slots:
     void retranslateUi();
     void clearAllDatabaseFilters();
-    void highlightAllSearchEdit();
 
 private:
     void createDatabaseDisplayDock(AbstractTabDeckEditor *deckEditor);
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp
index c625ff1d9..20eef180a 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp
@@ -147,11 +147,13 @@ void DeckEditorDatabaseDisplayWidget::updateCard(const QModelIndex &current, con
 
 void DeckEditorDatabaseDisplayWidget::actAddCardToMainDeck()
 {
+    highlightAllSearchEdit();
     emit addCardToMainDeck(currentCard());
 }
 
 void DeckEditorDatabaseDisplayWidget::actAddCardToSideboard()
 {
+    highlightAllSearchEdit();
     emit addCardToSideboard(currentCard());
 }
 
@@ -240,4 +242,9 @@ void DeckEditorDatabaseDisplayWidget::retranslateUi()
 {
     aAddCard->setText(tr("Add card to &maindeck"));
     aAddCardToSideboard->setText(tr("Add card to &sideboard"));
+}
+
+void DeckEditorDatabaseDisplayWidget::highlightAllSearchEdit()
+{
+    searchEdit->setSelection(0, searchEdit->text().length());
 }
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h
index 16ae6e255..0f62998ef 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h
@@ -25,7 +25,6 @@ class DeckEditorDatabaseDisplayWidget : public QWidget
 public:
     explicit DeckEditorDatabaseDisplayWidget(QWidget *parent, AbstractTabDeckEditor *deckEditor);
     AbstractTabDeckEditor *deckEditor;
-    SearchLineEdit *searchEdit;
     CardDatabaseModel *databaseModel;
     CardDatabaseDisplayModel *databaseDisplayModel;
 
@@ -58,10 +57,13 @@ private:
     KeySignals searchKeySignals;
     QTreeView *databaseView;
     QHBoxLayout *searchLayout;
+    SearchLineEdit *searchEdit;
     QAction *aAddCard, *aAddCardToSideboard;
     QVBoxLayout *centralFrame;
     QWidget *centralWidget;
 
+    void highlightAllSearchEdit();
+
 private slots:
     void retranslateUi();
     void saveDbHeaderState();
diff --git a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
index afc834e10..a739ac83b 100644
--- a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
+++ b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
@@ -137,8 +137,6 @@ void AbstractTabDeckEditor::onDeckModified()
 void AbstractTabDeckEditor::addCardHelper(const ExactCard &card, const QString &zoneName)
 {
     deckStateManager->addCard(card, zoneName);
-
-    cardDatabaseDockWidget->highlightAllSearchEdit();
 }
 
 /**