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

Prevent showing groups with no cards in them

Browse Source
This commit is contained in:
drdev
2014-07-17 03:30:11 +00:00
parent 0ee0f9e0f1
commit c09b003f19
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -572,17 +572,19 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
} }
groupY = y; groupY = y;
if (group.items.isEmpty()) {
group.setBounds(groupX, groupY, groupWidth, 0);
continue;
}
if (groupBy != null) { if (groupBy != null) {
y += GROUP_HEADER_HEIGHT + PADDING; //leave room for group header y += GROUP_HEADER_HEIGHT + PADDING; //leave room for group header
if (group.isCollapsed || group.items.isEmpty()) { if (group.isCollapsed) {
group.setBounds(groupX, groupY, groupWidth, GROUP_HEADER_HEIGHT); group.setBounds(groupX, groupY, groupWidth, GROUP_HEADER_HEIGHT);
continue; continue;
} }
} }
else if (group.items.isEmpty()) {
group.setBounds(groupX, groupY, groupWidth, 0);
continue;
}
if (pileBy == null) { if (pileBy == null) {
//if not piling by anything, wrap items using a pile for each row //if not piling by anything, wrap items using a pile for each row

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

@@ -450,19 +450,21 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
} }
groupY = y; groupY = y;
if (group.items.isEmpty()) {
group.setBounds(groupX, groupY, groupWidth, 0);
group.scrollWidth = groupWidth;
continue;
}
if (groupBy != null) { if (groupBy != null) {
y += GROUP_HEADER_HEIGHT + PADDING; //leave room for group header y += GROUP_HEADER_HEIGHT + PADDING; //leave room for group header
if (group.isCollapsed || group.items.isEmpty()) { if (group.isCollapsed) {
group.setBounds(groupX, groupY, groupWidth, GROUP_HEADER_HEIGHT); group.setBounds(groupX, groupY, groupWidth, GROUP_HEADER_HEIGHT);
group.scrollWidth = groupWidth; group.scrollWidth = groupWidth;
continue; continue;
} }
} }
else if (group.items.isEmpty()) {
group.setBounds(groupX, groupY, groupWidth, 0);
group.scrollWidth = groupWidth;
continue;
}
if (pileBy == null) { if (pileBy == null) {
//if not piling by anything, wrap items using a pile for each row //if not piling by anything, wrap items using a pile for each row