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

Prevent rendering counts for cards in catalog

Browse Source
This commit is contained in:
drdev
2014-06-21 03:03:44 +00:00
parent 932b3022d9
commit 46a7fe15a9
6 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -528,7 +528,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
needRefreshWhenShown = true;
return; //delay refreshing while hidden
}
cardManager.setPool(ItemPool.createFrom(FModel.getMagicDb().getCommonCards().getAllCards(), PaperCard.class));
cardManager.setPool(ItemPool.createFrom(FModel.getMagicDb().getCommonCards().getAllCards(), PaperCard.class), true);
}
@Override

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

@@ -18,7 +18,6 @@ import forge.itemmanager.filters.CardSetFilter;
import forge.itemmanager.filters.CardToughnessFilter;
import forge.itemmanager.filters.CardTypeFilter;
import forge.itemmanager.filters.ItemFilter;
import forge.itemmanager.views.ItemListView.ItemRenderer;
import forge.menu.FMenuItem;
import forge.menu.FPopupMenu;
import forge.menu.FSubMenu;
@@ -153,8 +152,8 @@ public class CardManager extends ItemManager<PaperCard> {
}
@Override
public ItemRenderer<PaperCard> getListItemRenderer() {
return new ItemRenderer<PaperCard>() {
public ItemRenderer getListItemRenderer() {
return new ItemRenderer() {
@Override
public float getItemHeight() {
return CardRenderer.getCardListItemHeight();
@@ -162,7 +161,7 @@ public class CardManager extends ItemManager<PaperCard> {
@Override
public void drawValue(Graphics g, Entry<PaperCard, Integer> value, FSkinFont font, FSkinColor foreColor, boolean pressed, float x, float y, float w, float h) {
CardRenderer.drawCardListItem(g, font, foreColor, value.getKey(), value.getValue(), x, y, w, h);
CardRenderer.drawCardListItem(g, font, foreColor, value.getKey(), isInfinite() ? 0 : value.getValue(), x, y, w, h);
}
@Override

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

@@ -17,7 +17,6 @@ import forge.itemmanager.filters.DeckFormatFilter;
import forge.itemmanager.filters.DeckSearchFilter;
import forge.itemmanager.filters.DeckSetFilter;
import forge.itemmanager.filters.ItemFilter;
import forge.itemmanager.views.ItemListView.ItemRenderer;
import forge.menu.FMenuItem;
import forge.menu.FPopupMenu;
import forge.menu.FSubMenu;
@@ -251,8 +250,8 @@ public final class DeckManager extends ItemManager<DeckProxy> {
private static final float IMAGE_SIZE = CardRenderer.MANA_SYMBOL_SIZE;
@Override
public ItemRenderer<DeckProxy> getListItemRenderer() {
return new ItemRenderer<DeckProxy>() {
public ItemRenderer getListItemRenderer() {
return new ItemRenderer() {
@Override
public float getItemHeight() {
if (DeckManager.this.getConfig().getCols().size() == 1) {

10
forge-gui-mobile/src/forge/itemmanager/ItemManager.java
View File

@@ -22,13 +22,14 @@ import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
import com.google.common.collect.Iterables;
import forge.Graphics;
import forge.assets.FSkinColor;
import forge.assets.FSkinFont;
import forge.assets.FSkinImage;
import forge.item.InventoryItem;
import forge.itemmanager.filters.ItemFilter;
import forge.itemmanager.views.ImageView;
import forge.itemmanager.views.ItemListView;
import forge.itemmanager.views.ItemListView.ItemRenderer;
import forge.itemmanager.views.ItemView;
import forge.menu.FMenuItem;
import forge.menu.FPopupMenu;
@@ -226,7 +227,12 @@ public abstract class ItemManager<T extends InventoryItem> extends FContainer im
setHideFilters(config0.getHideFilters());
}
public abstract ItemRenderer<T> getListItemRenderer();
public abstract class ItemRenderer {
public abstract float getItemHeight();
public abstract boolean tap(Entry<T, Integer> value, float x, float y, int count);
public abstract void drawValue(Graphics g, Entry<T, Integer> value, FSkinFont font, FSkinColor foreColor, boolean pressed, float x, float y, float w, float h);
}
public abstract ItemRenderer getListItemRenderer();
public void setViewIndex(int viewIndex) {
if (viewIndex < 0 || viewIndex >= views.size()) { return; }

5
forge-gui-mobile/src/forge/itemmanager/SpellShopManager.java
View File

@@ -9,7 +9,6 @@ import forge.card.CardRenderer;
import forge.item.InventoryItem;
import forge.item.PaperCard;
import forge.itemmanager.filters.ItemFilter;
import forge.itemmanager.views.ItemListView.ItemRenderer;
import forge.menu.FPopupMenu;
@@ -34,8 +33,8 @@ public final class SpellShopManager extends ItemManager<InventoryItem> {
}
@Override
public ItemRenderer<InventoryItem> getListItemRenderer() {
return new ItemRenderer<InventoryItem>() {
public ItemRenderer getListItemRenderer() {
return new ItemRenderer() {
@Override
public float getItemHeight() {
return CardRenderer.getCardListItemHeight();

8
forge-gui-mobile/src/forge/itemmanager/views/ItemListView.java
View File

@@ -250,14 +250,8 @@ public final class ItemListView<T extends InventoryItem> extends ItemView<T> {
return visibleWidth;
}
public abstract static class ItemRenderer<T extends InventoryItem> {
public abstract float getItemHeight();
public abstract boolean tap(Entry<T, Integer> value, float x, float y, int count);
public abstract void drawValue(Graphics g, Entry<T, Integer> value, FSkinFont font, FSkinColor foreColor, boolean pressed, float x, float y, float w, float h);
}
public final class ItemList extends FList<Entry<T, Integer>> {
private final ItemRenderer<T> renderer;
private final ItemManager<T>.ItemRenderer renderer;
private List<ItemColumn> cols = new ArrayList<ItemColumn>();
private ItemList() {