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

Prevent auto-selecting card when first opening deck, changing filters, or expanding/collapsing groups

Browse Source
This commit is contained in:
drdev
2014-02-04 17:45:23 +00:00
parent a2287aff5b
commit 06de741370
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ImageView.java
View File

@@ -72,25 +72,14 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
//if didn't click on item, see if clicked on group header //if didn't click on item, see if clicked on group header
if (groupBy != null) { if (groupBy != null) {
Point point = e.getPoint(); Point point = e.getPoint();
boolean collapsedChanged = false;
for (Group group : groups) { for (Group group : groups) {
if (!collapsedChanged && group.getBounds().contains(point)) { if (group.getBounds().contains(point)) {
if (!group.items.isEmpty() && point.y < group.getTop() + GROUP_HEADER_HEIGHT) { if (!group.items.isEmpty() && point.y < group.getTop() + GROUP_HEADER_HEIGHT) {
group.isCollapsed = !group.isCollapsed; group.isCollapsed = !group.isCollapsed;
clearSelection(); //must clear selection since indices and visible items will be changing clearSelection(); //must clear selection since indices and visible items will be changing
updateLayout(false); updateLayout(false);
collapsedChanged = true;
}
else {
break;
}
}
if (collapsedChanged) {
//if found group to expand/collapse, select next visible item starting at beginning of group
if (!group.isCollapsed && !group.items.isEmpty()) {
setSelectedIndex(group.piles.get(0).items.get(0).index);
break;
} }
break;
} }
} }
} }
@@ -188,7 +177,7 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
} }
if (!forSetup) { if (!forSetup) {
refresh(this.getSelectedItems(), this.getSelectedIndex()); refresh(null, -1);
} }
} }
@@ -203,7 +192,21 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
pileBy = pileBy0; pileBy = pileBy0;
if (!forSetup) { if (!forSetup) {
refresh(this.getSelectedItems(), this.getSelectedIndex()); refresh(null, -1);
}
}
@Override
protected void fixSelection(final Iterable<T> itemsToSelect, final int backupIndexToSelect) {
if (itemsToSelect == null) {
clearSelection(); //just clear selection if no items to select
getScroller().getVerticalScrollBar().setValue(0); //ensure scrolled to top
onSelectionChange();
}
else {
if (!setSelectedItems(itemsToSelect)) {
setSelectedIndex(backupIndexToSelect);
}
} }
} }

2
forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ItemView.java
View File

@@ -115,7 +115,7 @@ public abstract class ItemView<T extends InventoryItem> {
} }
protected abstract void onResize(); protected abstract void onResize();
protected abstract void onRefresh(); protected abstract void onRefresh();
private void fixSelection(final Iterable<T> itemsToSelect, final int backupIndexToSelect) { protected void fixSelection(final Iterable<T> itemsToSelect, final int backupIndexToSelect) {
if (itemsToSelect == null) { if (itemsToSelect == null) {
setSelectedIndex(0, false); //select first item if no items to select setSelectedIndex(0, false); //select first item if no items to select
getScroller().getVerticalScrollBar().setValue(0); //ensure scrolled to top getScroller().getVerticalScrollBar().setValue(0); //ensure scrolled to top