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

Prevent updating item manager view if filters didn't change

Browse Source 
Focus item manager when Deck Editor opened and when filters hidden/shown
This commit is contained in:
drdev
2014-01-04 03:07:14 +00:00
parent 85d32d49e2
commit 18809bc918
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
forge-gui/src/main/java/forge/gui/deckeditor/CDeckEditorUI.java
View File

@@ -472,6 +472,13 @@ public enum CDeckEditorUI implements ICDoc {
catView.setWantUnique(wantUnique);
deckView.setWantUnique(wantUnique);
catView.applyFilters();
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
catView.focus();
}
});
}
private class _FindAsYouType extends KeyAdapter {

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

@@ -211,6 +211,12 @@ public abstract class ItemManager<T extends InventoryItem> extends JPanel {
@Override
public void run() {
setHideFilters(!getHideFilters());
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
focus();
}
});
}
};
@@ -708,8 +714,10 @@ public abstract class ItemManager<T extends InventoryItem> extends JPanel {
predicates.add(mainSearchFilter.buildPredicate(this.genericType));
}
this.filterPredicate = predicates.size() == 0 ? null : Predicates.and(predicates);
Predicate<? super T> newFilterPredicate = predicates.size() == 0 ? null : Predicates.and(predicates);
if (this.filterPredicate == newFilterPredicate) { return; }
this.filterPredicate = newFilterPredicate;
if (this.pool != null) {
this.updateView(true);
}