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

- Add the Select All button to spell shop inventory when the UI allows it (landscape mode, running on desktop).

Browse Source
This commit is contained in:
Michael Kamensky
2020-08-29 09:05:41 +03:00
parent 9e9e7187d1
commit 9110d11d5c
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-gui-mobile/src/forge/screens/quest/QuestSpellShopScreen.java
View File

@@ -24,6 +24,7 @@ import forge.itemmanager.filters.ItemFilter;
import forge.menu.FDropDownMenu; import forge.menu.FDropDownMenu;
import forge.menu.FMenuItem; import forge.menu.FMenuItem;
import forge.model.FModel; import forge.model.FModel;
import forge.properties.ForgeConstants;
import forge.quest.QuestSpellShop; import forge.quest.QuestSpellShop;
import forge.quest.QuestUtil; import forge.quest.QuestUtil;
import forge.screens.TabPageScreen; import forge.screens.TabPageScreen;

16
forge-gui/src/main/java/forge/itemmanager/ItemManagerModel.java
View File

@@ -21,6 +21,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.Iterator;
import java.util.Map.Entry; import java.util.Map.Entry;
import forge.item.InventoryItem; import forge.item.InventoryItem;
@@ -132,7 +133,7 @@ public final class ItemManagerModel<T extends InventoryItem> {
//Manages sorting orders for multiple depths of sorting //Manages sorting orders for multiple depths of sorting
public final class CascadeManager { public final class CascadeManager {
private final List<ItemColumn> colsToSort = new ArrayList<>(3); private final List<ItemColumn> colsToSort = Collections.synchronizedList(new ArrayList<>(3));
private Sorter sorter = null; private Sorter sorter = null;
// Adds a column to sort cascade list. // Adds a column to sort cascade list.
@@ -188,12 +189,15 @@ public final class ItemManagerModel<T extends InventoryItem> {
private Sorter createSorter() { private Sorter createSorter() {
final List<ItemPoolSorter<InventoryItem>> oneColSorters = new ArrayList<>(maxSortDepth); final List<ItemPoolSorter<InventoryItem>> oneColSorters = new ArrayList<>(maxSortDepth);
for (final ItemColumn col : colsToSort) { synchronized (colsToSort) {
oneColSorters.add(new ItemPoolSorter<>( final Iterator<ItemColumn> it = colsToSort.iterator();
col.getFnSort(), while (it.hasNext()) {
col.getConfig().getSortState().equals(SortState.ASC))); final ItemColumn col = it.next();
oneColSorters.add(new ItemPoolSorter<>(
col.getFnSort(),
col.getConfig().getSortState().equals(SortState.ASC)));
}
} }
return new Sorter(oneColSorters); return new Sorter(oneColSorters);
} }