jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-15 03:28:49 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
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() void TabDeckEditor::actLoadDeck()
{ {
bool openInNewTab = SettingsCache::instance().getOpenDeckInNewTab(); bool openInNewTab = SettingsCache::instance().getOpenDeckInNewTab() && !isBlankNewDeck();
if (!openInNewTab && !confirmClose()) if (!openInNewTab && !confirmClose())
return; return;
@ -876,7 +876,7 @@ bool TabDeckEditor::actSaveDeckAs()
void TabDeckEditor::actLoadDeckFromClipboard() void TabDeckEditor::actLoadDeckFromClipboard()
{ {
bool openInNewTab = SettingsCache::instance().getOpenDeckInNewTab(); bool openInNewTab = SettingsCache::instance().getOpenDeckInNewTab() && !isBlankNewDeck();
if (!openInNewTab && !confirmClose()) if (!openInNewTab && !confirmClose())
return; return;
@ -985,6 +985,15 @@ void TabDeckEditor::recursiveExpand(const QModelIndex &index)
deckView->expand(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 CardInfoPtr TabDeckEditor::currentCardInfo() const
{ {
const QModelIndex currentIndex = databaseView->selectionModel()->currentIndex(); 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(); void showSearchSyntaxHelp();
private: private:
bool isBlankNewDeck() const;
CardInfoPtr currentCardInfo() const; CardInfoPtr currentCardInfo() const;
void addCardHelper(QString zoneName); void addCardHelper(QString zoneName);
void offsetCountAtIndex(const QModelIndex &idx, int offset); void offsetCountAtIndex(const QModelIndex &idx, int offset);