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

Don't show deck editor or viewer with home screen as backdrop

Browse Source
This commit is contained in:
drdev
2015-05-30 16:48:37 +00:00
parent e94ebd7991
commit 33ba289f23
7 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-gui-mobile/src/forge/GuiMobile.java
View File

@@ -190,14 +190,14 @@ public class GuiMobile implements IGuiBase {
public void showCardList(final String title, final String message, final List<PaperCard> 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<PaperCard> 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;
}

2
forge-gui-mobile/src/forge/deck/FDeckChooser.java
View File

@@ -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());
}
}
});

6
forge-gui-mobile/src/forge/deck/FDeckEditor.java
View File

@@ -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<FDeckEditor> {
});
}
@Override
public FScreen getLandscapeBackdropScreen() {
return null; //never use backdrop for editor
}
private boolean isLimitedEditor() {
switch (editorType) {
case Draft:

14
forge-gui-mobile/src/forge/deck/FDeckViewer.java
View File

@@ -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
}
}

2
forge-gui-mobile/src/forge/itemmanager/DeckManager.java
View File

@@ -104,7 +104,7 @@ public final class DeckManager extends ItemManager<DeckProxy> implements IHasGam
@Override
public boolean longPress(Integer index, Entry<DeckProxy, Integer> value, float x, float y) {
FDeckViewer.show(value.getKey().getDeck(), true);
FDeckViewer.show(value.getKey().getDeck());
return true;
}

2
forge-gui-mobile/src/forge/screens/match/views/VGameMenu.java
View File

@@ -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);
}
}
}));

2
forge-gui-mobile/src/forge/screens/quest/QuestDecksScreen.java
View File

@@ -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());
}
}
});