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

Fix so *NEW* suffix appears in quest deck editor

Browse Source
This commit is contained in:
drdev
2014-07-18 06:16:41 +00:00
parent 14cc111e2c
commit fd5332ea71
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -162,7 +162,7 @@ public class CardManager extends ItemManager<PaperCard> {
@Override @Override
public void drawValue(Graphics g, Entry<PaperCard, Integer> value, FSkinFont font, FSkinColor foreColor, FSkinColor backColor, boolean pressed, float x, float y, float w, float h) { public void drawValue(Graphics g, Entry<PaperCard, Integer> value, FSkinFont font, FSkinColor foreColor, FSkinColor backColor, boolean pressed, float x, float y, float w, float h) {
CardRenderer.drawCardListItem(g, font, foreColor, value.getKey(), isInfinite() ? 0 : value.getValue(), null, x, y, w, h); CardRenderer.drawCardListItem(g, font, foreColor, value.getKey(), isInfinite() ? 0 : value.getValue(), getItemSuffix(value), x, y, w, h);
} }
@Override @Override

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

@@ -37,6 +37,7 @@ import forge.menu.FDropDownMenu;
import forge.menu.FMenuItem; import forge.menu.FMenuItem;
import forge.menu.FPopupMenu; import forge.menu.FPopupMenu;
import forge.menu.FSubMenu; import forge.menu.FSubMenu;
import forge.model.FModel;
import forge.screens.FScreen; import forge.screens.FScreen;
import forge.toolbox.FContainer; import forge.toolbox.FContainer;
import forge.toolbox.FEvent; import forge.toolbox.FEvent;
@@ -70,6 +71,7 @@ public abstract class ItemManager<T extends InventoryItem> extends FContainer im
private ItemManagerConfig config; private ItemManagerConfig config;
private String caption = "Items"; private String caption = "Items";
private String ratio = "(0 / 0)"; private String ratio = "(0 / 0)";
private boolean hasNewColumn;
private final ItemFilter<? extends T> mainSearchFilter; private final ItemFilter<? extends T> mainSearchFilter;
@@ -231,6 +233,11 @@ public abstract class ItemManager<T extends InventoryItem> extends FContainer im
} }
setViewIndex(config0.getViewIndex()); setViewIndex(config0.getViewIndex());
setHideFilters(config0.getHideFilters()); setHideFilters(config0.getHideFilters());
hasNewColumn = config.getCols().containsKey(ColumnDef.NEW);
}
protected String getItemSuffix(Entry<T, Integer> item) {
return hasNewColumn && FModel.getQuest().getCards().isNew(item.getKey()) ? " *NEW*" : null;
} }
public abstract class ItemRenderer { public abstract class ItemRenderer {

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

@@ -17,7 +17,6 @@ import forge.item.InventoryItem;
import forge.item.PaperCard; import forge.item.PaperCard;
import forge.itemmanager.filters.ItemFilter; import forge.itemmanager.filters.ItemFilter;
import forge.menu.FPopupMenu; import forge.menu.FPopupMenu;
import forge.model.FModel;
import forge.quest.QuestSpellShop; import forge.quest.QuestSpellShop;
import forge.toolbox.FList; import forge.toolbox.FList;
@@ -63,8 +62,7 @@ public final class SpellShopManager extends ItemManager<InventoryItem> {
float cardArtWidth = totalHeight * CardRenderer.CARD_ART_RATIO; float cardArtWidth = totalHeight * CardRenderer.CARD_ART_RATIO;
if (value.getKey() instanceof PaperCard) { if (value.getKey() instanceof PaperCard) {
String suffix = getConfig().getCols().containsKey(ColumnDef.NEW) && FModel.getQuest().getCards().isNew(value.getKey()) ? " *NEW*" : null; CardRenderer.drawCardListItem(g, font, foreColor, (PaperCard)value.getKey(), value.getValue(), getItemSuffix(value), x, y, w, h);
CardRenderer.drawCardListItem(g, font, foreColor, (PaperCard)value.getKey(), value.getValue(), suffix, x, y, w, h);
} }
else { else {
g.drawText(value.getValue().toString() + " " + value.getKey().toString(), font, foreColor, x + cardArtWidth, y, w - cardArtWidth, h, false, HAlignment.LEFT, true); g.drawText(value.getValue().toString() + " " + value.getKey().toString(), font, foreColor, x + cardArtWidth, y, w - cardArtWidth, h, false, HAlignment.LEFT, true);