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

Allow deselecting image view item by tapping again

Browse Source 
Change Creatures/Spells/Lands group by to "Default" to make it more concise
This commit is contained in:
drdev
2014-05-24 19:44:24 +00:00
parent 0163db63a6
commit cc432ecc69
4 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java
View File

@@ -43,7 +43,7 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
private static final int MIN_COLUMN_COUNT = 1; private static final int MIN_COLUMN_COUNT = 1;
private static final int MAX_COLUMN_COUNT = 10; private static final int MAX_COLUMN_COUNT = 10;
private static final GroupDef[] CARD_GROUPBY_OPTIONS = { GroupDef.CREATURE_SPELL_LAND, GroupDef.CARD_TYPE, GroupDef.COLOR, GroupDef.COLOR_IDENTITY, GroupDef.CARD_RARITY }; private static final GroupDef[] CARD_GROUPBY_OPTIONS = { GroupDef.DEFAULT, GroupDef.CARD_TYPE, GroupDef.COLOR, GroupDef.COLOR_IDENTITY, GroupDef.CARD_RARITY };
private static final GroupDef[] DECK_GROUPBY_OPTIONS = { GroupDef.COLOR, GroupDef.COLOR_IDENTITY }; private static final GroupDef[] DECK_GROUPBY_OPTIONS = { GroupDef.COLOR, GroupDef.COLOR_IDENTITY };
private static final ColumnDef[] CARD_PILEBY_OPTIONS = { ColumnDef.CMC, ColumnDef.COLOR, ColumnDef.NAME, ColumnDef.COST, ColumnDef.TYPE, ColumnDef.RARITY, ColumnDef.SET }; private static final ColumnDef[] CARD_PILEBY_OPTIONS = { ColumnDef.CMC, ColumnDef.COLOR, ColumnDef.NAME, ColumnDef.COST, ColumnDef.TYPE, ColumnDef.RARITY, ColumnDef.SET };
private static final ColumnDef[] DECK_PILEBY_OPTIONS = { ColumnDef.DECK_COLOR, ColumnDef.DECK_FOLDER, ColumnDef.NAME, ColumnDef.DECK_FORMAT, ColumnDef.DECK_EDITION }; private static final ColumnDef[] DECK_PILEBY_OPTIONS = { ColumnDef.DECK_COLOR, ColumnDef.DECK_FOLDER, ColumnDef.NAME, ColumnDef.DECK_FORMAT, ColumnDef.DECK_EDITION };

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

@@ -413,7 +413,7 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
//determine width of combo boxes based on available width versus auto-size widths //determine width of combo boxes based on available width versus auto-size widths
float lblPileByWidth = lblPileBy.getAutoSizeBounds().width; float lblPileByWidth = lblPileBy.getAutoSizeBounds().width;
float availableComboBoxWidth = visibleWidth - x - lblPileByWidth - padding; float availableComboBoxWidth = visibleWidth - x - lblPileByWidth - padding;
float groupByWidth = availableComboBoxWidth * 0.66f; float groupByWidth = availableComboBoxWidth * 0.5f;
float pileByWidth = availableComboBoxWidth - groupByWidth; float pileByWidth = availableComboBoxWidth - groupByWidth;
cbGroupByOptions.setBounds(x, y, groupByWidth, h); cbGroupByOptions.setBounds(x, y, groupByWidth, h);
@@ -732,14 +732,12 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
return false; return false;
} }
if (item.selected) { if (item.selected) { //unselect item if already selected
if (KeyInputAdapter.isCtrlKeyDown()) { item.selected = false;
item.selected = false; selectedIndices.remove((Object)item.index);
selectedIndices.remove((Object)item.index); onSelectionChange();
onSelectionChange(); item.group.scrollIntoView(item);
item.group.scrollIntoView(item); return true;
return true;
}
} }
if (!allowMultipleSelections || (!KeyInputAdapter.isCtrlKeyDown() && !KeyInputAdapter.isShiftKeyDown())) { if (!allowMultipleSelections || (!KeyInputAdapter.isCtrlKeyDown() && !KeyInputAdapter.isShiftKeyDown())) {
clearSelection(); clearSelection();

2
forge-gui/src/main/java/forge/itemmanager/GroupDef.java
View File

@@ -47,7 +47,7 @@ public enum GroupDef {
return -1; return -1;
} }
}), }),
CREATURE_SPELL_LAND("Creatures/Spells/Lands", DEFAULT("Default",
new String[] { "Creatures", "Spells", "Lands" }, new String[] { "Creatures", "Spells", "Lands" },
new Function<Integer, ColumnDef>() { new Function<Integer, ColumnDef>() {
@Override @Override

8
forge-gui/src/main/java/forge/itemmanager/ItemManagerConfig.java
View File

@@ -25,11 +25,11 @@ public enum ItemManagerConfig {
CARD_CATALOG(SColumnUtil.getCatalogDefaultColumns(true), true, false, false, CARD_CATALOG(SColumnUtil.getCatalogDefaultColumns(true), true, false, false,
null, null, 4, 0), null, null, 4, 0),
DECK_EDITOR(SColumnUtil.getDeckEditorDefaultColumns(), false, false, false, DECK_EDITOR(SColumnUtil.getDeckEditorDefaultColumns(), false, false, false,
GroupDef.CREATURE_SPELL_LAND, ColumnDef.CMC, 4, 1), GroupDef.DEFAULT, ColumnDef.CMC, 4, 1),
DRAFT_PACK(SColumnUtil.getDraftPackDefaultColumns(), false, false, true, DRAFT_PACK(SColumnUtil.getDraftPackDefaultColumns(), false, false, true,
null, null, 4, 1), null, null, 4, 1),
DRAFT_POOL(SColumnUtil.getCatalogDefaultColumns(false), false, false, false, DRAFT_POOL(SColumnUtil.getCatalogDefaultColumns(false), false, false, false,
GroupDef.CREATURE_SPELL_LAND, ColumnDef.CMC, 4, 1), GroupDef.DEFAULT, ColumnDef.CMC, 4, 1),
SEALED_POOL(SColumnUtil.getCatalogDefaultColumns(false), false, false, false, SEALED_POOL(SColumnUtil.getCatalogDefaultColumns(false), false, false, false,
GroupDef.COLOR, ColumnDef.CMC, 4, 1), GroupDef.COLOR, ColumnDef.CMC, 4, 1),
SPELL_SHOP(SColumnUtil.getSpellShopDefaultColumns(), false, false, false, SPELL_SHOP(SColumnUtil.getSpellShopDefaultColumns(), false, false, false,
@@ -39,7 +39,7 @@ public enum ItemManagerConfig {
QUEST_EDITOR_POOL(SColumnUtil.getQuestEditorPoolDefaultColumns(), false, false, false, QUEST_EDITOR_POOL(SColumnUtil.getQuestEditorPoolDefaultColumns(), false, false, false,
null, null, 4, 0), null, null, 4, 0),
QUEST_DECK_EDITOR(SColumnUtil.getQuestDeckEditorDefaultColumns(), false, false, false, QUEST_DECK_EDITOR(SColumnUtil.getQuestDeckEditorDefaultColumns(), false, false, false,
GroupDef.CREATURE_SPELL_LAND, ColumnDef.CMC, 4, 1), GroupDef.DEFAULT, ColumnDef.CMC, 4, 1),
AVATAR_POOL(SColumnUtil.getSpecialCardPoolDefaultColumns(), true, false, false, AVATAR_POOL(SColumnUtil.getSpecialCardPoolDefaultColumns(), true, false, false,
null, null, 4, 0), null, null, 4, 0),
SCHEME_POOL(SColumnUtil.getSpecialCardPoolDefaultColumns(), true, false, false, SCHEME_POOL(SColumnUtil.getSpecialCardPoolDefaultColumns(), true, false, false,
@@ -51,7 +51,7 @@ public enum ItemManagerConfig {
WORKSHOP_CATALOG(SColumnUtil.getCatalogDefaultColumns(true), true, true, false, WORKSHOP_CATALOG(SColumnUtil.getCatalogDefaultColumns(true), true, true, false,
null, null, 4, 0), null, null, 4, 0),
DECK_VIEWER(SColumnUtil.getDeckViewerDefaultColumns(), false, false, false, DECK_VIEWER(SColumnUtil.getDeckViewerDefaultColumns(), false, false, false,
GroupDef.CREATURE_SPELL_LAND, ColumnDef.CMC, 4, 1), GroupDef.DEFAULT, ColumnDef.CMC, 4, 1),
CONSTRUCTED_DECKS(SColumnUtil.getDecksDefaultColumns(true, true), false, false, false, CONSTRUCTED_DECKS(SColumnUtil.getDecksDefaultColumns(true, true), false, false, false,
null, null, 3, 0), null, null, 3, 0),
DRAFT_DECKS(SColumnUtil.getDecksDefaultColumns(true, false), false, false, false, DRAFT_DECKS(SColumnUtil.getDecksDefaultColumns(true, false), false, false, false,