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

Merge branch 'deck-editor-unique-filter' into 'master'

Browse Source 
Deck editor filters bug

See merge request core-developers/forge!2214
This commit is contained in:
swordshine
2019-10-07 03:45:17 +00:00
parent 0bf17333ad c07230c447
commit c7a1aae06b
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-gui-desktop/src/main/java/forge/gui/framework/FScreen.java
View File

@@ -28,7 +28,7 @@ public class FScreen {
public static final FScreen HOME_SCREEN = new FScreen( public static final FScreen HOME_SCREEN = new FScreen(
VHomeUI.SINGLETON_INSTANCE, VHomeUI.SINGLETON_INSTANCE,
CHomeUI.SINGLETON_INSTANCE, CHomeUI.SINGLETON_INSTANCE,
"Home", "Home ",
FSkin.getIcon(FSkinProp.ICO_FAVICON), FSkin.getIcon(FSkinProp.ICO_FAVICON),
false, false,
"Exit Forge", "Exit Forge",
@@ -46,7 +46,7 @@ public class FScreen {
public static final FScreen DECK_EDITOR_CONSTRUCTED = new FScreen( public static final FScreen DECK_EDITOR_CONSTRUCTED = new FScreen(
VDeckEditorUI.SINGLETON_INSTANCE, VDeckEditorUI.SINGLETON_INSTANCE,
CDeckEditorUI.SINGLETON_INSTANCE, CDeckEditorUI.SINGLETON_INSTANCE,
"Deck Editor", "Deck Editor ",
FSkin.getImage(FSkinProp.IMG_PACK), FSkin.getImage(FSkinProp.IMG_PACK),
false, false,
"Back to Home", "Back to Home",

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

@@ -77,6 +77,7 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
private Point hoverScrollPos; private Point hoverScrollPos;
private ItemInfo hoveredItem; private ItemInfo hoveredItem;
private ItemInfo focalItem; private ItemInfo focalItem;
private boolean panelOptionsCreated = false;
private final List<ItemInfo> orderedItems = new ArrayList<>(); private final List<ItemInfo> orderedItems = new ArrayList<>();
private final List<Group> groups = new ArrayList<>(); private final List<Group> groups = new ArrayList<>();
@@ -337,7 +338,12 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
@Override @Override
public void setup(ItemManagerConfig config, Map<ColumnDef, ItemTableColumn> colOverrides) { public void setup(ItemManagerConfig config, Map<ColumnDef, ItemTableColumn> colOverrides) {
// if this is the first setup call, panel options will be added to UI components
if (!this.panelOptionsCreated){
setPanelOptions(config.getShowUniqueCardsOption()); setPanelOptions(config.getShowUniqueCardsOption());
this.panelOptionsCreated = true;
}
// set status of components in the panel
setGroupBy(config.getGroupBy(), true); setGroupBy(config.getGroupBy(), true);
setPileBy(config.getPileBy(), true); setPileBy(config.getPileBy(), true);
setColumnCount(config.getImageColumnCount(), true); setColumnCount(config.getImageColumnCount(), true);