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

Update to card view of decks so long-press opens deck viewer to be consistent with list view

Browse Source
This commit is contained in:
austinio7116
2018-02-22 08:51:11 +00:00
committed by maustin
parent 6231775997
commit 2891133c5c
4 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
forge-gui-mobile/src/forge/card/CardZoom.java
View File

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

7
forge-gui-mobile/src/forge/itemmanager/views/ImageView.java
View File

@@ -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<T extends InventoryItem> extends ItemView<T> {
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;
}