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

[TabDeckEditor] Refactor check ctrl to be on click (#6956)

Browse source
This commit is contained in:
RickyRister 2026-05-31 03:44:40 -07:00 • committed by GitHub
parent c5372a9e92
commit 3fa377a11c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp
View file

@ -79,7 +79,7 @@ DeckEditorDatabaseDisplayWidget::DeckEditorDatabaseDisplayWidget(QWidget *parent
&DeckEditorDatabaseDisplayWidget::databaseCustomMenu); &DeckEditorDatabaseDisplayWidget::databaseCustomMenu);
connect(databaseView->selectionModel(), &QItemSelectionModel::currentRowChanged, this, connect(databaseView->selectionModel(), &QItemSelectionModel::currentRowChanged, this,
&DeckEditorDatabaseDisplayWidget::updateCard); &DeckEditorDatabaseDisplayWidget::updateCard);
connect(databaseView, &QTreeView::doubleClicked, this, &DeckEditorDatabaseDisplayWidget::actAddCardToMainDeck); connect(databaseView, &QTreeView::doubleClicked, this, &DeckEditorDatabaseDisplayWidget::actAddCard);
QByteArray dbHeaderState = SettingsCache::instance().layouts().getDeckEditorDbHeaderState(); QByteArray dbHeaderState = SettingsCache::instance().layouts().getDeckEditorDbHeaderState();
if (dbHeaderState.isNull()) { if (dbHeaderState.isNull()) {
@ -146,6 +146,15 @@ void DeckEditorDatabaseDisplayWidget::updateCard(const QModelIndex &current, con
} }
} }
void DeckEditorDatabaseDisplayWidget::actAddCard()
{
if (QApplication::keyboardModifiers() & Qt::ControlModifier) {
actAddCardToSideboard();
} else {
actAddCardToMainDeck();
}
}
void DeckEditorDatabaseDisplayWidget::actAddCardToMainDeck() void DeckEditorDatabaseDisplayWidget::actAddCardToMainDeck()
{ {
highlightAllSearchEdit(); highlightAllSearchEdit();

1
cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h
View file

@ -39,6 +39,7 @@ public slots:
void clearAllDatabaseFilters(); void clearAllDatabaseFilters();
void updateSearch(const QString &search); void updateSearch(const QString &search);
void updateCard(const QModelIndex &current, const QModelIndex &); void updateCard(const QModelIndex &current, const QModelIndex &);
void actAddCard();
void actAddCardToMainDeck(); void actAddCardToMainDeck();
void actAddCardToSideboard(); void actAddCardToSideboard();
void actDecrementCardFromMainDeck(); void actDecrementCardFromMainDeck();

6
cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
View file

@ -144,11 +144,7 @@ void AbstractTabDeckEditor::decrementCard(const ExactCard &card, const QString &
*/ */
void AbstractTabDeckEditor::actAddCard(const ExactCard &card) void AbstractTabDeckEditor::actAddCard(const ExactCard &card)
{ {
if (QApplication::keyboardModifiers() & Qt::ControlModifier) { addCard(card, DECK_ZONE_MAIN);
actAddCardToSideboard(card);
} else {
addCard(card, DECK_ZONE_MAIN);
}
} }
/** @brief Adds a card to the sideboard explicitly. */ /** @brief Adds a card to the sideboard explicitly. */

6
cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
View file

@ -223,7 +223,11 @@ void TabDeckEditorVisual::processCardClickDatabaseDisplay(QMouseEvent *event,
CardInfoPictureWithTextOverlayWidget *instance) CardInfoPictureWithTextOverlayWidget *instance)
{ {
if (event->button() == Qt::LeftButton) { if (event->button() == Qt::LeftButton) {
actAddCard(instance->getCard()); if (QApplication::keyboardModifiers() & Qt::ControlModifier) {
actAddCardToSideboard(instance->getCard());
} else {
actAddCard(instance->getCard());
}
} else if (event->button() == Qt::RightButton) { } else if (event->button() == Qt::RightButton) {
actDecrementCard(instance->getCard()); actDecrementCard(instance->getCard());
} else if (event->button() == Qt::MiddleButton) { } else if (event->button() == Qt::MiddleButton) {