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

Fix Maven version issues

Browse Source
This commit is contained in:
drdev
2014-05-24 19:50:46 +00:00
parent cc432ecc69
commit 59694962bc
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui-android/pom.xml
View File

@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>forge</artifactId> <artifactId>forge</artifactId>
<groupId>forge</groupId> <groupId>forge</groupId>
<version>1.5.18-SNAPSHOT</version> <version>1.5.19-SNAPSHOT</version>
</parent> </parent>
<artifactId>forge-gui-android</artifactId> <artifactId>forge-gui-android</artifactId>

2
forge-gui-mobile-dev/pom.xml
View File

@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>forge</groupId> <groupId>forge</groupId>
<artifactId>forge-gui-mobile-dev</artifactId> <artifactId>forge-gui-mobile-dev</artifactId>
<version>1.5.18-SNAPSHOT</version> <version>1.5.19-SNAPSHOT</version>
<name>Forge</name> <name>Forge</name>
<build> <build>
<sourceDirectory>src</sourceDirectory> <sourceDirectory>src</sourceDirectory>

2
forge-gui-mobile/pom.xml
View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>forge</groupId> <groupId>forge</groupId>
<artifactId>forge-gui-mobile</artifactId> <artifactId>forge-gui-mobile</artifactId>
<version>1.5.18-SNAPSHOT</version> <version>1.5.19-SNAPSHOT</version>
<name>Forge Mobile</name> <name>Forge Mobile</name>
<build> <build>
<sourceDirectory>src</sourceDirectory> <sourceDirectory>src</sourceDirectory>

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

@@ -50,7 +50,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 };
@@ -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.5f; float groupByWidth = availableComboBoxWidth * 0.6f;
float pileByWidth = availableComboBoxWidth - groupByWidth; float pileByWidth = availableComboBoxWidth - groupByWidth;
cbGroupByOptions.setBounds(x, y, groupByWidth, h); cbGroupByOptions.setBounds(x, y, groupByWidth, h);