jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-12 09:04:53 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

[DeckEditor] Don't change widget focus when adding card (#6503)

Browse source
This commit is contained in:
RickyRister 2026-01-09 18:27:54 -08:00 • committed by GitHub
parent 7c7755b61d
commit 0deaa9d9b4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp
View file

@ -459,12 +459,15 @@ void DeckEditorDeckDockWidget::syncBannerCardComboBoxSelectionWithDeck()
} }
} }
void DeckEditorDeckDockWidget::setSelectedIndex(const QModelIndex &newCardIndex) void DeckEditorDeckDockWidget::setSelectedIndex(const QModelIndex &newCardIndex, bool preserveWidgetFocus)
{ {
deckView->clearSelection(); deckView->clearSelection();
deckView->setCurrentIndex(newCardIndex); deckView->setCurrentIndex(newCardIndex);
recursiveExpand(newCardIndex); recursiveExpand(newCardIndex);
deckView->setFocus(Qt::FocusReason::MouseFocusReason);
if (!preserveWidgetFocus) {
deckView->setFocus(Qt::FocusReason::MouseFocusReason);
}
} }
void DeckEditorDeckDockWidget::syncDisplayWidgetsToModel() void DeckEditorDeckDockWidget::syncDisplayWidgetsToModel()

2
cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h
View file

@ -100,7 +100,7 @@ private slots:
void writeComments(); void writeComments();
void writeBannerCard(int); void writeBannerCard(int);
void applyActiveGroupCriteria(); void applyActiveGroupCriteria();
void setSelectedIndex(const QModelIndex &newCardIndex); void setSelectedIndex(const QModelIndex &newCardIndex, bool preserveWidgetFocus);
void updateHash(); void updateHash();
void refreshShortcuts(); void refreshShortcuts();
void updateShowBannerCardComboBox(bool visible); void updateShowBannerCardComboBox(bool visible);

4
cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp
View file

@ -182,7 +182,7 @@ QModelIndex DeckStateManager::addCard(const ExactCard &card, const QString &zone
QModelIndex idx = modifyDeck(reason, [&card, &zone](auto model) { return model->addCard(card, zone); }); QModelIndex idx = modifyDeck(reason, [&card, &zone](auto model) { return model->addCard(card, zone); });
if (idx.isValid()) { if (idx.isValid()) {
emit focusIndexChanged(idx); emit focusIndexChanged(idx, true);
} }
return idx; return idx;
@ -208,7 +208,7 @@ QModelIndex DeckStateManager::decrementCard(const ExactCard &card, const QString
} }
if (idx.isValid()) { if (idx.isValid()) {
emit focusIndexChanged(idx); emit focusIndexChanged(idx, true);
} }
return idx; return idx;

3
cockatrice/src/interface/widgets/deck_editor/deck_state_manager.h
View file

@ -290,8 +290,9 @@ signals:
/** /**
* The selected card on any views connected to this deck should be changed to this index. * The selected card on any views connected to this deck should be changed to this index.
* @param index The model index * @param index The model index
* @param preserveWidgetFocus Whether to keep the widget focus unchanged
*/ */
void focusIndexChanged(QModelIndex index); void focusIndexChanged(QModelIndex index, bool preserveWidgetFocus);
}; };
#endif // COCKATRICE_DECK_STATE_MANAGER_H #endif // COCKATRICE_DECK_STATE_MANAGER_H

2
cockatrice/src/interface/widgets/printing_selector/card_amount_widget.cpp
View file

@ -198,7 +198,7 @@ void CardAmountWidget::addPrinting(const QString &zone)
}); });
if (newCardIndex.isValid()) { if (newCardIndex.isValid()) {
emit deckStateManager->focusIndexChanged(newCardIndex); emit deckStateManager->focusIndexChanged(newCardIndex, false);
} }
} }