diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java b/forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java index 8a181c36647..9b18bae108c 100644 --- a/forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java +++ b/forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java @@ -43,7 +43,7 @@ public class ImageView extends ItemView { private static final int MIN_COLUMN_COUNT = 1; 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 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 }; diff --git a/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java b/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java index 5da3b86e1f6..d9b889795e4 100644 --- a/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java +++ b/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java @@ -413,7 +413,7 @@ public class ImageView extends ItemView { //determine width of combo boxes based on available width versus auto-size widths float lblPileByWidth = lblPileBy.getAutoSizeBounds().width; float availableComboBoxWidth = visibleWidth - x - lblPileByWidth - padding; - float groupByWidth = availableComboBoxWidth * 0.66f; + float groupByWidth = availableComboBoxWidth * 0.5f; float pileByWidth = availableComboBoxWidth - groupByWidth; cbGroupByOptions.setBounds(x, y, groupByWidth, h); @@ -732,14 +732,12 @@ public class ImageView extends ItemView { return false; } - if (item.selected) { - if (KeyInputAdapter.isCtrlKeyDown()) { - item.selected = false; - selectedIndices.remove((Object)item.index); - onSelectionChange(); - item.group.scrollIntoView(item); - return true; - } + if (item.selected) { //unselect item if already selected + item.selected = false; + selectedIndices.remove((Object)item.index); + onSelectionChange(); + item.group.scrollIntoView(item); + return true; } if (!allowMultipleSelections || (!KeyInputAdapter.isCtrlKeyDown() && !KeyInputAdapter.isShiftKeyDown())) { clearSelection(); diff --git a/forge-gui/src/main/java/forge/itemmanager/GroupDef.java b/forge-gui/src/main/java/forge/itemmanager/GroupDef.java index 8627386610a..87bb77d73eb 100644 --- a/forge-gui/src/main/java/forge/itemmanager/GroupDef.java +++ b/forge-gui/src/main/java/forge/itemmanager/GroupDef.java @@ -47,7 +47,7 @@ public enum GroupDef { return -1; } }), - CREATURE_SPELL_LAND("Creatures/Spells/Lands", + DEFAULT("Default", new String[] { "Creatures", "Spells", "Lands" }, new Function() { @Override diff --git a/forge-gui/src/main/java/forge/itemmanager/ItemManagerConfig.java b/forge-gui/src/main/java/forge/itemmanager/ItemManagerConfig.java index 48f29281579..8e575d39bae 100644 --- a/forge-gui/src/main/java/forge/itemmanager/ItemManagerConfig.java +++ b/forge-gui/src/main/java/forge/itemmanager/ItemManagerConfig.java @@ -25,11 +25,11 @@ public enum ItemManagerConfig { CARD_CATALOG(SColumnUtil.getCatalogDefaultColumns(true), true, false, false, null, null, 4, 0), 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, null, null, 4, 1), 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, GroupDef.COLOR, ColumnDef.CMC, 4, 1), SPELL_SHOP(SColumnUtil.getSpellShopDefaultColumns(), false, false, false, @@ -39,7 +39,7 @@ public enum ItemManagerConfig { QUEST_EDITOR_POOL(SColumnUtil.getQuestEditorPoolDefaultColumns(), false, false, false, null, null, 4, 0), 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, null, null, 4, 0), SCHEME_POOL(SColumnUtil.getSpecialCardPoolDefaultColumns(), true, false, false, @@ -51,7 +51,7 @@ public enum ItemManagerConfig { WORKSHOP_CATALOG(SColumnUtil.getCatalogDefaultColumns(true), true, true, false, null, null, 4, 0), 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, null, null, 3, 0), DRAFT_DECKS(SColumnUtil.getDecksDefaultColumns(true, false), false, false, false,