mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-19 12:18:00 +00:00
Don't show deck editor or viewer with home screen as backdrop
This commit is contained in:
@@ -190,14 +190,14 @@ public class GuiMobile implements IGuiBase {
|
|||||||
public void showCardList(final String title, final String message, final List<PaperCard> list) {
|
public void showCardList(final String title, final String message, final List<PaperCard> list) {
|
||||||
final Deck deck = new Deck(title + " - " + message);
|
final Deck deck = new Deck(title + " - " + message);
|
||||||
deck.getMain().addAllFlat(list);
|
deck.getMain().addAllFlat(list);
|
||||||
FDeckViewer.show(deck, false);
|
FDeckViewer.show(deck);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean showBoxedProduct(final String title, final String message, final List<PaperCard> list) {
|
public boolean showBoxedProduct(final String title, final String message, final List<PaperCard> list) {
|
||||||
final Deck deck = new Deck(title + " - " + message); //TODO: Make this nicer
|
final Deck deck = new Deck(title + " - " + message); //TODO: Make this nicer
|
||||||
deck.getMain().addAllFlat(list);
|
deck.getMain().addAllFlat(list);
|
||||||
FDeckViewer.show(deck, false);
|
FDeckViewer.show(deck);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -148,7 +148,7 @@ public class FDeckChooser extends FScreen {
|
|||||||
@Override
|
@Override
|
||||||
public void handleEvent(FEvent e) {
|
public void handleEvent(FEvent e) {
|
||||||
if (selectedDeckType != DeckType.COLOR_DECK && selectedDeckType != DeckType.THEME_DECK) {
|
if (selectedDeckType != DeckType.COLOR_DECK && selectedDeckType != DeckType.THEME_DECK) {
|
||||||
FDeckViewer.show(getDeck(), true);
|
FDeckViewer.show(getDeck());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -43,6 +43,7 @@ import forge.model.FModel;
|
|||||||
import forge.planarconquest.ConquestUtil;
|
import forge.planarconquest.ConquestUtil;
|
||||||
import forge.properties.ForgePreferences.FPref;
|
import forge.properties.ForgePreferences.FPref;
|
||||||
import forge.quest.data.QuestPreferences.QPref;
|
import forge.quest.data.QuestPreferences.QPref;
|
||||||
|
import forge.screens.FScreen;
|
||||||
import forge.screens.TabPageScreen;
|
import forge.screens.TabPageScreen;
|
||||||
import forge.toolbox.FContainer;
|
import forge.toolbox.FContainer;
|
||||||
import forge.toolbox.FEvent;
|
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() {
|
private boolean isLimitedEditor() {
|
||||||
switch (editorType) {
|
switch (editorType) {
|
||||||
case Draft:
|
case Draft:
|
||||||
|
|||||||
@@ -15,7 +15,6 @@ import forge.itemmanager.filters.ItemFilter;
|
|||||||
import forge.menu.FMenuItem;
|
import forge.menu.FMenuItem;
|
||||||
import forge.menu.FPopupMenu;
|
import forge.menu.FPopupMenu;
|
||||||
import forge.screens.FScreen;
|
import forge.screens.FScreen;
|
||||||
import forge.screens.home.HomeScreen;
|
|
||||||
import forge.screens.match.MatchController;
|
import forge.screens.match.MatchController;
|
||||||
import forge.toolbox.FEvent;
|
import forge.toolbox.FEvent;
|
||||||
import forge.toolbox.FEvent.FEventHandler;
|
import forge.toolbox.FEvent.FEventHandler;
|
||||||
@@ -116,17 +115,16 @@ public class FDeckViewer extends FScreen {
|
|||||||
private final Deck deck;
|
private final Deck deck;
|
||||||
private final CardManager cardManager;
|
private final CardManager cardManager;
|
||||||
private DeckSection currentSection;
|
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; }
|
if (deck0 == null) { return; }
|
||||||
|
|
||||||
deckViewer = new FDeckViewer(deck0, fromHomeScreen0);
|
deckViewer = new FDeckViewer(deck0);
|
||||||
deckViewer.setRotate180(MatchController.getView() != null && MatchController.getView().isTopHumanPlayerActive());
|
deckViewer.setRotate180(MatchController.getView() != null && MatchController.getView().isTopHumanPlayerActive());
|
||||||
Forge.openScreen(deckViewer);
|
Forge.openScreen(deckViewer);
|
||||||
}
|
}
|
||||||
|
|
||||||
private FDeckViewer(Deck deck0, boolean fromHomeScreen0) {
|
private FDeckViewer(Deck deck0) {
|
||||||
super(new MenuHeader(deck0.getName(), menu) {
|
super(new MenuHeader(deck0.getName(), menu) {
|
||||||
@Override
|
@Override
|
||||||
protected boolean displaySidebarForLandscapeMode() {
|
protected boolean displaySidebarForLandscapeMode() {
|
||||||
@@ -134,7 +132,6 @@ public class FDeckViewer extends FScreen {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
deck = deck0;
|
deck = deck0;
|
||||||
fromHomeScreen = fromHomeScreen0;
|
|
||||||
cardManager = new CardManager(false);
|
cardManager = new CardManager(false);
|
||||||
cardManager.setPool(deck.getMain());
|
cardManager.setPool(deck.getMain());
|
||||||
|
|
||||||
@@ -169,9 +166,6 @@ public class FDeckViewer extends FScreen {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public FScreen getLandscapeBackdropScreen() {
|
public FScreen getLandscapeBackdropScreen() {
|
||||||
if (fromHomeScreen) {
|
return null; //never use backdrop for editor
|
||||||
return HomeScreen.instance;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -104,7 +104,7 @@ public final class DeckManager extends ItemManager<DeckProxy> implements IHasGam
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean longPress(Integer index, Entry<DeckProxy, Integer> value, float x, float y) {
|
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;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ public class VGameMenu extends FDropDownMenu {
|
|||||||
public void handleEvent(FEvent e) {
|
public void handleEvent(FEvent e) {
|
||||||
final Deck deck = MatchController.getHostedMatch().getGame().getPhaseHandler().getPlayerTurn().getRegisteredPlayer().getDeck();
|
final Deck deck = MatchController.getHostedMatch().getGame().getPhaseHandler().getPlayerTurn().getRegisteredPlayer().getDeck();
|
||||||
if (deck != null) {
|
if (deck != null) {
|
||||||
FDeckViewer.show(deck, false);
|
FDeckViewer.show(deck);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
|
|||||||
@@ -102,7 +102,7 @@ public class QuestDecksScreen extends FScreen {
|
|||||||
public void handleEvent(FEvent e) {
|
public void handleEvent(FEvent e) {
|
||||||
final DeckProxy deck = lstDecks.getSelectedItem();
|
final DeckProxy deck = lstDecks.getSelectedItem();
|
||||||
if (deck != null) {
|
if (deck != null) {
|
||||||
FDeckViewer.show(deck.getDeck(), true);
|
FDeckViewer.show(deck.getDeck());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user