diff --git a/forge-gui-mobile/src/forge/card/CardZoom.java b/forge-gui-mobile/src/forge/card/CardZoom.java index 4b934b34f61..eeac3ec4dea 100644 --- a/forge-gui-mobile/src/forge/card/CardZoom.java +++ b/forge-gui-mobile/src/forge/card/CardZoom.java @@ -10,7 +10,10 @@ import com.badlogic.gdx.math.Rectangle; import forge.Forge; import forge.Graphics; import forge.assets.FSkinImage; +import forge.deck.CardThemedDeckGenerator; +import forge.deck.CommanderDeckGenerator; import forge.deck.DeckProxy; +import forge.deck.FDeckViewer; import forge.game.GameView; import forge.game.card.CardView; import forge.item.IPaperCard; @@ -125,8 +128,15 @@ public class CardZoom extends FOverlay { return (CardView)item; } if (item instanceof DeckProxy) { - DeckProxy deck = ((DeckProxy)item); - return new CardView(-1, null, deck.getName(), null, deck.getImageKey(false)); + if (item instanceof CardThemedDeckGenerator){ + return CardView.getCardForUi(((CardThemedDeckGenerator)item).getPaperCard()); + }else if (item instanceof CommanderDeckGenerator){ + return CardView.getCardForUi(((CommanderDeckGenerator)item).getPaperCard()); + }else{ + DeckProxy deck = ((DeckProxy)item); + return new CardView(-1, null, deck.getName(), null, deck.getImageKey(false)); + } + } if (item instanceof IPaperCard) { return CardView.getCardForUi((IPaperCard)item); diff --git a/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java b/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java index 13f1b774b6e..999a62b16e0 100644 --- a/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java +++ b/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java @@ -11,7 +11,10 @@ import forge.assets.ImageCache; import forge.card.CardRenderer; import forge.card.CardRenderer.CardStackPosition; import forge.card.CardZoom; +import forge.deck.CardThemedDeckGenerator; +import forge.deck.CommanderDeckGenerator; import forge.deck.DeckProxy; +import forge.deck.FDeckViewer; import forge.item.InventoryItem; import forge.item.PaperCard; import forge.itemmanager.ColumnDef; @@ -861,6 +864,10 @@ public class ImageView extends ItemView { public boolean longPress(float x, float y) { ItemInfo item = getItemAtPoint(x + getLeft(), y + getTop()); if (item != null) { + if(item.getKey() instanceof CardThemedDeckGenerator || item.getKey() instanceof CommanderDeckGenerator){ + FDeckViewer.show(((DeckProxy)item.getKey()).getDeck()); + return true; + } CardZoom.show(orderedItems, orderedItems.indexOf(item), itemManager); return true; } diff --git a/forge-gui/src/main/java/forge/deck/CardThemedDeckGenerator.java b/forge-gui/src/main/java/forge/deck/CardThemedDeckGenerator.java index b536ebb6a17..aa972a8152a 100644 --- a/forge-gui/src/main/java/forge/deck/CardThemedDeckGenerator.java +++ b/forge-gui/src/main/java/forge/deck/CardThemedDeckGenerator.java @@ -72,4 +72,8 @@ public class CardThemedDeckGenerator extends DeckProxy implements Comparable