external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix Quest Draft Editor

Browse Source 
Closes: core-developers/forge#724

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
This commit is contained in:
Jamin W. Collins
2018-09-23 13:08:23 -06:00
parent 781400c0a3
commit bbf63d9083
1 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestDraftingProcess.java
View File

@@ -29,8 +29,11 @@ import forge.limited.BoosterDraft;
import forge.limited.IBoosterDraft; import forge.limited.IBoosterDraft;
import forge.quest.QuestEventDraft; import forge.quest.QuestEventDraft;
import forge.screens.deckeditor.views.VAllDecks; import forge.screens.deckeditor.views.VAllDecks;
import forge.screens.deckeditor.views.VBrawlDecks;
import forge.screens.deckeditor.views.VCommanderDecks;
import forge.screens.deckeditor.views.VCurrentDeck; import forge.screens.deckeditor.views.VCurrentDeck;
import forge.screens.deckeditor.views.VDeckgen; import forge.screens.deckeditor.views.VDeckgen;
import forge.screens.deckeditor.views.VTinyLeadersDecks;
import forge.screens.home.quest.CSubmenuQuestDraft; import forge.screens.home.quest.CSubmenuQuestDraft;
import forge.screens.home.quest.VSubmenuQuestDraft; import forge.screens.home.quest.VSubmenuQuestDraft;
import forge.screens.match.controllers.CDetailPicture; import forge.screens.match.controllers.CDetailPicture;
@@ -57,7 +60,10 @@ public class CEditorQuestDraftingProcess extends ACEditorBase<PaperCard, DeckGro
private IBoosterDraft boosterDraft; private IBoosterDraft boosterDraft;
private String ccAddLabel = "Add card"; private String ccAddLabel = "Add card";
private DragCell allDecksParent = null; private DragCell constructedDecksParent = null;
private DragCell commanderDecksParent = null;
private DragCell brawlDecksParent = null;
private DragCell tinyLeadersDecksParent = null;
private DragCell deckGenParent = null; private DragCell deckGenParent = null;
private boolean saved = false; private boolean saved = false;
@@ -275,10 +281,16 @@ public class CEditorQuestDraftingProcess extends ACEditorBase<PaperCard, DeckGro
VCurrentDeck.SINGLETON_INSTANCE.getPnlHeader().setVisible(false); VCurrentDeck.SINGLETON_INSTANCE.getPnlHeader().setVisible(false);
deckGenParent = removeTab(VDeckgen.SINGLETON_INSTANCE); deckGenParent = removeTab(VDeckgen.SINGLETON_INSTANCE);
allDecksParent = removeTab(VAllDecks.SINGLETON_INSTANCE); constructedDecksParent = removeTab(VAllDecks.SINGLETON_INSTANCE);
commanderDecksParent = removeTab(VCommanderDecks.SINGLETON_INSTANCE);
brawlDecksParent = removeTab(VBrawlDecks.SINGLETON_INSTANCE);
tinyLeadersDecksParent = removeTab(VTinyLeadersDecks.SINGLETON_INSTANCE);
// set catalog table to single-selection only mode // set catalog table to single-selection only mode
getCatalogManager().setAllowMultipleSelections(false); getCatalogManager().setAllowMultipleSelections(false);
// this appears to be needed to actually show the available draft choices
getCatalogManager().refresh();
} }
/* (non-Javadoc) /* (non-Javadoc)
@@ -316,8 +328,17 @@ public class CEditorQuestDraftingProcess extends ACEditorBase<PaperCard, DeckGro
if (deckGenParent != null) { if (deckGenParent != null) {
deckGenParent.addDoc(VDeckgen.SINGLETON_INSTANCE); deckGenParent.addDoc(VDeckgen.SINGLETON_INSTANCE);
} }
if (allDecksParent != null) { if (constructedDecksParent != null) {
allDecksParent.addDoc(VAllDecks.SINGLETON_INSTANCE); constructedDecksParent.addDoc(VAllDecks.SINGLETON_INSTANCE);
}
if (commanderDecksParent != null) {
commanderDecksParent.addDoc(VCommanderDecks.SINGLETON_INSTANCE);
}
if (brawlDecksParent!= null) {
brawlDecksParent.addDoc(VBrawlDecks.SINGLETON_INSTANCE);
}
if (tinyLeadersDecksParent != null) {
tinyLeadersDecksParent.addDoc(VTinyLeadersDecks.SINGLETON_INSTANCE);
} }
// set catalog table back to free-selection mode // set catalog table back to free-selection mode