From 59694962bce6df683f8b15d4315f3236bb5926e3 Mon Sep 17 00:00:00 2001 From: drdev Date: Sat, 24 May 2014 19:50:46 +0000 Subject: [PATCH] Fix Maven version issues --- forge-gui-android/pom.xml | 2 +- forge-gui-mobile-dev/pom.xml | 2 +- forge-gui-mobile/pom.xml | 2 +- forge-gui-mobile/src/forge/itemmanager/views/ImageView.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/forge-gui-android/pom.xml b/forge-gui-android/pom.xml index 8fd51523478..15644fa78de 100644 --- a/forge-gui-android/pom.xml +++ b/forge-gui-android/pom.xml @@ -5,7 +5,7 @@ forge forge - 1.5.18-SNAPSHOT + 1.5.19-SNAPSHOT forge-gui-android diff --git a/forge-gui-mobile-dev/pom.xml b/forge-gui-mobile-dev/pom.xml index deb18a3a5bc..f84f4947bdb 100644 --- a/forge-gui-mobile-dev/pom.xml +++ b/forge-gui-mobile-dev/pom.xml @@ -2,7 +2,7 @@ 4.0.0 forge forge-gui-mobile-dev - 1.5.18-SNAPSHOT + 1.5.19-SNAPSHOT Forge src diff --git a/forge-gui-mobile/pom.xml b/forge-gui-mobile/pom.xml index 745e41cf987..a1d4d10a8c9 100644 --- a/forge-gui-mobile/pom.xml +++ b/forge-gui-mobile/pom.xml @@ -3,7 +3,7 @@ 4.0.0 forge forge-gui-mobile - 1.5.18-SNAPSHOT + 1.5.19-SNAPSHOT Forge Mobile src diff --git a/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java b/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java index d9b889795e4..28c578df2fd 100644 --- a/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java +++ b/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java @@ -50,7 +50,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 }; @@ -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.5f; + float groupByWidth = availableComboBoxWidth * 0.6f; float pileByWidth = availableComboBoxWidth - groupByWidth; cbGroupByOptions.setBounds(x, y, groupByWidth, h);