From 21ab65c61ba9052d6fb043b92af08164925f7c6f Mon Sep 17 00:00:00 2001 From: drdev Date: Mon, 17 Nov 2014 04:03:45 +0000 Subject: [PATCH] Fix so LoadDraftScreen opened when finished editing draft deck --- forge-gui-mobile/src/forge/Forge.java | 8 ++++++++ .../src/forge/screens/limited/DraftingProcessScreen.java | 3 +++ .../src/forge/screens/limited/LoadDraftScreen.java | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java index 0a89f26f1f2..42101c07799 100644 --- a/forge-gui-mobile/src/forge/Forge.java +++ b/forge-gui-mobile/src/forge/Forge.java @@ -158,6 +158,14 @@ public class Forge implements ApplicationListener { }); } + //set screen that will be gone to on pressing Back before going to current Back screen + public static void setBackScreen(final FScreen screen0) { + int index = screens.size() - 1; + if (index > 0 && screens.get(index) != screen0) { + screens.add(index, screen0); + } + } + public static void exit(boolean silent) { if (exited) { return; } //don't allow exiting multiple times diff --git a/forge-gui-mobile/src/forge/screens/limited/DraftingProcessScreen.java b/forge-gui-mobile/src/forge/screens/limited/DraftingProcessScreen.java index 1d2cf6905f4..58a1ff736fa 100644 --- a/forge-gui-mobile/src/forge/screens/limited/DraftingProcessScreen.java +++ b/forge-gui-mobile/src/forge/screens/limited/DraftingProcessScreen.java @@ -2,6 +2,7 @@ package forge.screens.limited; import org.apache.commons.lang3.StringUtils; +import forge.Forge; import forge.deck.Deck; import forge.deck.DeckGroup; import forge.deck.FDeckEditor; @@ -86,6 +87,8 @@ public class DraftingProcessScreen extends FDeckEditor { getEditorType().getController().load("", name); DeckPreferences.setDraftDeck(name); + Forge.setBackScreen(new LoadDraftScreen()); //set load draft screen to be opened when user done editing deck + //show header for main deck and sideboard when finished drafting deckHeader.setVisible(true); revalidate(); diff --git a/forge-gui-mobile/src/forge/screens/limited/LoadDraftScreen.java b/forge-gui-mobile/src/forge/screens/limited/LoadDraftScreen.java index 053f480d237..ea76c570459 100644 --- a/forge-gui-mobile/src/forge/screens/limited/LoadDraftScreen.java +++ b/forge-gui-mobile/src/forge/screens/limited/LoadDraftScreen.java @@ -32,7 +32,7 @@ public class LoadDraftScreen extends LaunchScreen { .align(HAlignment.CENTER).font(FSkinFont.get(12)).build()); public LoadDraftScreen() { - super("Load Booster Draft"); + super("Booster Draft"); lstDecks.setup(ItemManagerConfig.DRAFT_DECKS); lstDecks.setItemActivateHandler(new FEventHandler() {