gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-02-04 19:11:38 -08:00
Code Issues Packages Projects Releases Wiki Activity

don't open deck in new tab if current tab is blank (#5169)

Browse Source
This commit is contained in:
RickyRister
2024-11-18 02:59:34 -08:00
committed by GitHub
parent f4e2f117c3
commit 86a4b130ff
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cockatrice/src/client/tabs/tab_deck_editor.cpp
View File

@@ -783,7 +783,7 @@ void TabDeckEditor::actNewDeck()
void TabDeckEditor::actLoadDeck()
{
bool openInNewTab = SettingsCache::instance().getOpenDeckInNewTab();
bool openInNewTab = SettingsCache::instance().getOpenDeckInNewTab() && !isBlankNewDeck();
if (!openInNewTab && !confirmClose())
return;
@@ -876,7 +876,7 @@ bool TabDeckEditor::actSaveDeckAs()
void TabDeckEditor::actLoadDeckFromClipboard()
{
bool openInNewTab = SettingsCache::instance().getOpenDeckInNewTab();
bool openInNewTab = SettingsCache::instance().getOpenDeckInNewTab() && !isBlankNewDeck();
if (!openInNewTab && !confirmClose())
return;
@@ -985,6 +985,15 @@ void TabDeckEditor::recursiveExpand(const QModelIndex &index)
deckView->expand(index);
}
/**
* @brief Returns true if this tab is a blank newly opened tab, as if it was just created with the `New Deck` action.
*/
bool TabDeckEditor::isBlankNewDeck() const
{
DeckLoader *const deck = deckModel->getDeckList();
return !modified && deck->getLastFileName().isEmpty() && deck->getLastRemoteDeckId() == -1;
}
CardInfoPtr TabDeckEditor::currentCardInfo() const
{
const QModelIndex currentIndex = databaseView->selectionModel()->currentIndex();

1
cockatrice/src/client/tabs/tab_deck_editor.h
View File

@@ -100,6 +100,7 @@ private slots:
void showSearchSyntaxHelp();
private:
bool isBlankNewDeck() const;
CardInfoPtr currentCardInfo() const;
void addCardHelper(QString zoneName);
void offsetCountAtIndex(const QModelIndex &idx, int offset);