From 33ba289f237562d77a2a566534eff240f58600d1 Mon Sep 17 00:00:00 2001 From: drdev Date: Sat, 30 May 2015 16:48:37 +0000 Subject: [PATCH] Don't show deck editor or viewer with home screen as backdrop --- forge-gui-mobile/src/forge/GuiMobile.java | 4 ++-- forge-gui-mobile/src/forge/deck/FDeckChooser.java | 2 +- forge-gui-mobile/src/forge/deck/FDeckEditor.java | 6 ++++++ forge-gui-mobile/src/forge/deck/FDeckViewer.java | 14 ++++---------- .../src/forge/itemmanager/DeckManager.java | 2 +- .../src/forge/screens/match/views/VGameMenu.java | 2 +- .../src/forge/screens/quest/QuestDecksScreen.java | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/forge-gui-mobile/src/forge/GuiMobile.java b/forge-gui-mobile/src/forge/GuiMobile.java index 5737ee5463a..bbb00e77db0 100644 --- a/forge-gui-mobile/src/forge/GuiMobile.java +++ b/forge-gui-mobile/src/forge/GuiMobile.java @@ -190,14 +190,14 @@ public class GuiMobile implements IGuiBase { public void showCardList(final String title, final String message, final List list) { final Deck deck = new Deck(title + " - " + message); deck.getMain().addAllFlat(list); - FDeckViewer.show(deck, false); + FDeckViewer.show(deck); } @Override public boolean showBoxedProduct(final String title, final String message, final List list) { final Deck deck = new Deck(title + " - " + message); //TODO: Make this nicer deck.getMain().addAllFlat(list); - FDeckViewer.show(deck, false); + FDeckViewer.show(deck); return false; } diff --git a/forge-gui-mobile/src/forge/deck/FDeckChooser.java b/forge-gui-mobile/src/forge/deck/FDeckChooser.java index 8fd8d4221af..dd474184bb1 100644 --- a/forge-gui-mobile/src/forge/deck/FDeckChooser.java +++ b/forge-gui-mobile/src/forge/deck/FDeckChooser.java @@ -148,7 +148,7 @@ public class FDeckChooser extends FScreen { @Override public void handleEvent(FEvent e) { if (selectedDeckType != DeckType.COLOR_DECK && selectedDeckType != DeckType.THEME_DECK) { - FDeckViewer.show(getDeck(), true); + FDeckViewer.show(getDeck()); } } }); diff --git a/forge-gui-mobile/src/forge/deck/FDeckEditor.java b/forge-gui-mobile/src/forge/deck/FDeckEditor.java index 17b67a67b15..0e46be0e550 100644 --- a/forge-gui-mobile/src/forge/deck/FDeckEditor.java +++ b/forge-gui-mobile/src/forge/deck/FDeckEditor.java @@ -43,6 +43,7 @@ import forge.model.FModel; import forge.planarconquest.ConquestUtil; import forge.properties.ForgePreferences.FPref; import forge.quest.data.QuestPreferences.QPref; +import forge.screens.FScreen; import forge.screens.TabPageScreen; import forge.toolbox.FContainer; import forge.toolbox.FEvent; @@ -506,6 +507,11 @@ public class FDeckEditor extends TabPageScreen { }); } + @Override + public FScreen getLandscapeBackdropScreen() { + return null; //never use backdrop for editor + } + private boolean isLimitedEditor() { switch (editorType) { case Draft: diff --git a/forge-gui-mobile/src/forge/deck/FDeckViewer.java b/forge-gui-mobile/src/forge/deck/FDeckViewer.java index 41e0756fde6..b1a589292f8 100644 --- a/forge-gui-mobile/src/forge/deck/FDeckViewer.java +++ b/forge-gui-mobile/src/forge/deck/FDeckViewer.java @@ -15,7 +15,6 @@ import forge.itemmanager.filters.ItemFilter; import forge.menu.FMenuItem; import forge.menu.FPopupMenu; import forge.screens.FScreen; -import forge.screens.home.HomeScreen; import forge.screens.match.MatchController; import forge.toolbox.FEvent; import forge.toolbox.FEvent.FEventHandler; @@ -116,17 +115,16 @@ public class FDeckViewer extends FScreen { private final Deck deck; private final CardManager cardManager; private DeckSection currentSection; - private final boolean fromHomeScreen; - public static void show(final Deck deck0, boolean fromHomeScreen0) { + public static void show(final Deck deck0) { if (deck0 == null) { return; } - deckViewer = new FDeckViewer(deck0, fromHomeScreen0); + deckViewer = new FDeckViewer(deck0); deckViewer.setRotate180(MatchController.getView() != null && MatchController.getView().isTopHumanPlayerActive()); Forge.openScreen(deckViewer); } - private FDeckViewer(Deck deck0, boolean fromHomeScreen0) { + private FDeckViewer(Deck deck0) { super(new MenuHeader(deck0.getName(), menu) { @Override protected boolean displaySidebarForLandscapeMode() { @@ -134,7 +132,6 @@ public class FDeckViewer extends FScreen { } }); deck = deck0; - fromHomeScreen = fromHomeScreen0; cardManager = new CardManager(false); cardManager.setPool(deck.getMain()); @@ -169,9 +166,6 @@ public class FDeckViewer extends FScreen { @Override public FScreen getLandscapeBackdropScreen() { - if (fromHomeScreen) { - return HomeScreen.instance; - } - return null; + return null; //never use backdrop for editor } } diff --git a/forge-gui-mobile/src/forge/itemmanager/DeckManager.java b/forge-gui-mobile/src/forge/itemmanager/DeckManager.java index f5ef3fba097..2e7d2d752bd 100644 --- a/forge-gui-mobile/src/forge/itemmanager/DeckManager.java +++ b/forge-gui-mobile/src/forge/itemmanager/DeckManager.java @@ -104,7 +104,7 @@ public final class DeckManager extends ItemManager implements IHasGam @Override public boolean longPress(Integer index, Entry value, float x, float y) { - FDeckViewer.show(value.getKey().getDeck(), true); + FDeckViewer.show(value.getKey().getDeck()); return true; } diff --git a/forge-gui-mobile/src/forge/screens/match/views/VGameMenu.java b/forge-gui-mobile/src/forge/screens/match/views/VGameMenu.java index f04caa873b4..3be40c8910b 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VGameMenu.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VGameMenu.java @@ -47,7 +47,7 @@ public class VGameMenu extends FDropDownMenu { public void handleEvent(FEvent e) { final Deck deck = MatchController.getHostedMatch().getGame().getPhaseHandler().getPlayerTurn().getRegisteredPlayer().getDeck(); if (deck != null) { - FDeckViewer.show(deck, false); + FDeckViewer.show(deck); } } })); diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestDecksScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestDecksScreen.java index b8bb25ededf..8b389e0241a 100644 --- a/forge-gui-mobile/src/forge/screens/quest/QuestDecksScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/QuestDecksScreen.java @@ -102,7 +102,7 @@ public class QuestDecksScreen extends FScreen { public void handleEvent(FEvent e) { final DeckProxy deck = lstDecks.getSelectedItem(); if (deck != null) { - FDeckViewer.show(deck.getDeck(), true); + FDeckViewer.show(deck.getDeck()); } } });