diff --git a/forge-gui-mobile/src/forge/itemmanager/ItemManager.java b/forge-gui-mobile/src/forge/itemmanager/ItemManager.java index 1e8d987eda7..75d39654404 100644 --- a/forge-gui-mobile/src/forge/itemmanager/ItemManager.java +++ b/forge-gui-mobile/src/forge/itemmanager/ItemManager.java @@ -1132,13 +1132,15 @@ public abstract class ItemManager extends FContainer im } public float getPileByWidth() { - if (cbxSortOptions != null) { - return cbxSortOptions.getWidth(); - } if (filters.get().isEmpty()) { return 0f; } - return filters.get().get(filters.get().size() - 1).getWidget().getWidth(); + float preferredSize = filters.get().get(filters.get().size() - 1).getWidget().getWidth(); + if (cbxSortOptions != null && Math.abs(1 - (cbxSortOptions.getWidth() / preferredSize)) < 0.25) { + //Match the size of the sort box if it's not too far off from what we'd prefer. + return cbxSortOptions.getWidth(); + } + return preferredSize; } @Override diff --git a/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java b/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java index 3e3d4a3943d..cf383a0b3fc 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 { btnExpandCollapseAll.setBounds(x, y, h, h); x += h + padding; - float pileByWidth = itemManager.getPileByWidth(); + float pileByWidth = Math.min(itemManager.getPileByWidth(), (width - x - padding) / 2.0f); float groupByWidth = width - x - padding - pileByWidth; cbGroupByOptions.setBounds(x, y, groupByWidth, h);