Leahnaya/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-08-23 01:04:37 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

[TabDeckEditor] Refactor check ctrl to be on click (#6956)
Some checks failed
Build Desktop / Configure (push) Has been cancelled
Details
Build Docker Image / amd64 & arm64 (push) Has been cancelled
Details
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Debian, DEB, 13) (push) Has been cancelled
Details
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Debian, DEB, skip, 12) (push) Has been cancelled
Details
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Fedora, RPM, 44) (push) Has been cancelled
Details
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Fedora, RPM, skip, 43) (push) Has been cancelled
Details
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Servatrice_Debian, DEB, yes, skip, 12) (push) Has been cancelled
Details
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Ubuntu, DEB, 26.04) (push) Has been cancelled
Details
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Ubuntu, DEB, skip, 24.04) (push) Has been cancelled
Details
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (yes, Arch, skip) (push) Has been cancelled
Details
Build Desktop / ${{matrix.os}} ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} (7d, Ninja, 1, macOS, -macOS14, clang_64, qtimageformats qtmultimedia qtwebsockets, 6.11.0, macos-14, Apple, 14, Release, 1, … (push) Has been cancelled
Details
Build Desktop / ${{matrix.os}} ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} (7d, Ninja, 1, macOS, -macOS15, clang_64, qtimageformats qtmultimedia qtwebsockets, 6.11.0, macos-15, Apple, 15, Release, 1, … (push) Has been cancelled
Details
Build Desktop / ${{matrix.os}} ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} (7d, Ninja, 1, macOS, 13, -macOS13_Intel, clang_64, qtimageformats qtmultimedia qtwebsockets, 6.11.0, macos-15-intel, Intel, … (push) Has been cancelled
Details
Build Desktop / ${{matrix.os}} ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} (7d, Ninja, macOS, clang_64, qtimageformats qtmultimedia qtwebsockets, 6.11.0, macos-15, Apple, 15, Debug, 1, 16.4) (push) Has been cancelled
Details
Build Desktop / ${{matrix.os}} ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} (Visual Studio 17 2022, x64, 1, Windows, -Win10, win64_msvc2022_64, qtimageformats qtmultimedia qtwebsockets, 6.11.0, windows… (push) Has been cancelled
Details

Browse Source
This commit is contained in:
RickyRister
2026-05-31 03:44:40 -07:00
committed by GitHub
parent c5372a9e92
commit 3fa377a11c
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);
connect(databaseView->selectionModel(), &QItemSelectionModel::currentRowChanged, this,
&DeckEditorDatabaseDisplayWidget::updateCard);
connect(databaseView, &QTreeView::doubleClicked, this, &DeckEditorDatabaseDisplayWidget::actAddCardToMainDeck);
connect(databaseView, &QTreeView::doubleClicked, this, &DeckEditorDatabaseDisplayWidget::actAddCard);
QByteArray dbHeaderState = SettingsCache::instance().layouts().getDeckEditorDbHeaderState();
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()
{
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 updateSearch(const QString &search);
void updateCard(const QModelIndex &current, const QModelIndex &);
void actAddCard();
void actAddCardToMainDeck();
void actAddCardToSideboard();
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)
{
if (QApplication::keyboardModifiers() & Qt::ControlModifier) {
actAddCardToSideboard(card);
} else {
addCard(card, DECK_ZONE_MAIN);
}
addCard(card, DECK_ZONE_MAIN);
}
/** @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)
{
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) {
actDecrementCard(instance->getCard());
} else if (event->button() == Qt::MiddleButton) {