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

Support hiding filters by default on Draft screen

Browse Source
This commit is contained in:
drdev
2014-02-08 18:23:21 +00:00
parent a40da18132
commit 96ff2dc09e
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorDraftingProcess.java
View File

@@ -69,6 +69,7 @@ public class CEditorDraftingProcess extends ACEditorBase<PaperCard, DeckGroup> {
final CardManager catalogManager = new CardManager(false); final CardManager catalogManager = new CardManager(false);
final CardManager deckManager = new CardManager(false); final CardManager deckManager = new CardManager(false);
catalogManager.setHideFilters(true); //hide filters so more of pack is visible by default
deckManager.setCaption("Draft Picks"); deckManager.setCaption("Draft Picks");
catalogManager.setAlwaysNonUnique(true); catalogManager.setAlwaysNonUnique(true);

13
forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManager.java
View File

@@ -102,7 +102,7 @@ public abstract class ItemManager<T extends InventoryItem> extends JPanel {
.readonly() //TODO: Support editing filter logic .readonly() //TODO: Support editing filter logic
.build(); .build();
private ItemFilter<? extends T> mainSearchFilter; private final ItemFilter<? extends T> mainSearchFilter;
private final SkinnedPanel pnlButtons = new SkinnedPanel(new MigLayout("insets 0, gap 0, ax center, hidemode 3")); private final SkinnedPanel pnlButtons = new SkinnedPanel(new MigLayout("insets 0, gap 0, ax center, hidemode 3"));
private final FLabel btnFilters = new FLabel.ButtonBuilder() private final FLabel btnFilters = new FLabel.ButtonBuilder()
@@ -148,6 +148,8 @@ public abstract class ItemManager<T extends InventoryItem> extends JPanel {
this.wantUnique = wantUnique0; this.wantUnique = wantUnique0;
this.model = new ItemManagerModel<T>(genericType0); this.model = new ItemManagerModel<T>(genericType0);
this.mainSearchFilter = createSearchFilter();
this.listView = new ItemListView<T>(this, this.model); this.listView = new ItemListView<T>(this, this.model);
this.imageView = createImageView(this.model); this.imageView = createImageView(this.model);
@@ -196,7 +198,6 @@ public abstract class ItemManager<T extends InventoryItem> extends JPanel {
this.setLayout(null); this.setLayout(null);
this.add(this.chkEnableFilters); this.add(this.chkEnableFilters);
this.add(this.txtFilterLogic); this.add(this.txtFilterLogic);
this.mainSearchFilter = createSearchFilter();
this.add(mainSearchFilter.getWidget()); this.add(mainSearchFilter.getWidget());
this.pnlButtons.setOpaque(false); this.pnlButtons.setOpaque(false);
this.pnlButtons.setBorder(new FSkin.MatteSkinBorder(1, 0, 1, 0, FSkin.getColor(Colors.CLR_TEXT))); this.pnlButtons.setBorder(new FSkin.MatteSkinBorder(1, 0, 1, 0, FSkin.getColor(Colors.CLR_TEXT)));
@@ -832,9 +833,14 @@ public abstract class ItemManager<T extends InventoryItem> extends JPanel {
classFilters.add(filter); classFilters.add(filter);
orderedFilters.add(filter); orderedFilters.add(filter);
this.add(filter.getPanel()); this.add(filter.getPanel());
boolean visible = !this.hideFilters;
filter.getPanel().setVisible(visible);
if (visible && this.initialized) {
this.revalidate(); this.revalidate();
this.applyNewOrModifiedFilter(filter); this.applyNewOrModifiedFilter(filter);
} }
}
//apply filters and focus existing filter's main component if filtering not locked //apply filters and focus existing filter's main component if filtering not locked
private void applyNewOrModifiedFilter(final ItemFilter<? extends T> filter) { private void applyNewOrModifiedFilter(final ItemFilter<? extends T> filter) {
@@ -941,6 +947,8 @@ public abstract class ItemManager<T extends InventoryItem> extends JPanel {
this.chkEnableFilters.setVisible(visible); this.chkEnableFilters.setVisible(visible);
this.txtFilterLogic.setVisible(visible); this.txtFilterLogic.setVisible(visible);
this.mainSearchFilter.getWidget().setVisible(visible); this.mainSearchFilter.getWidget().setVisible(visible);
if (this.initialized) {
this.revalidate(); this.revalidate();
if (hideFilters0) { if (hideFilters0) {
@@ -950,6 +958,7 @@ public abstract class ItemManager<T extends InventoryItem> extends JPanel {
this.applyFilters(); this.applyFilters();
} }
} }
}
/** /**
* *