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

Fix image view selection

Browse Source
This commit is contained in:
drdev
2014-05-22 23:58:07 +00:00
parent 013e291321
commit d074a5ff38
2 changed files with 58 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
forge-gui-mobile/src/forge/itemmanager/views/ImageView.java
View File

@@ -544,6 +544,20 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
return groups.get(groups.size() - 1).getBottom() + PADDING; return groups.get(groups.size() - 1).getBottom() + PADDING;
} }
@Override
protected boolean onScrollerTap(float x, float y, int count) {
ItemInfo item = getItemAtPoint(x, y);
if (count == 1) {
selectItem(item);
}
else if (count == 2) {
if (item != null && item.selected) {
itemManager.activateSelectedItems();
}
}
return true;
}
private ItemInfo getItemAtPoint(float x, float y) { private ItemInfo getItemAtPoint(float x, float y) {
for (int i = groups.size() - 1; i >= 0; i--) { for (int i = groups.size() - 1; i >= 0; i--) {
Group group = groups.get(i); Group group = groups.get(i);
@@ -682,6 +696,35 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
} }
} }
private boolean selectItem(ItemInfo item) {
if (item == null) {
if (!KeyInputAdapter.isCtrlKeyDown() && !KeyInputAdapter.isShiftKeyDown()) {
clearSelection();
onSelectionChange();
}
return false;
}
if (item.selected) {
if (KeyInputAdapter.isCtrlKeyDown()) {
item.selected = false;
selectedIndices.remove((Object)item.index);
onSelectionChange();
item.group.scrollIntoView(item);
return true;
}
}
if (!allowMultipleSelections || (!KeyInputAdapter.isCtrlKeyDown() && !KeyInputAdapter.isShiftKeyDown())) {
clearSelection();
}
selectedIndices.add(0, item.index);
item.selected = true;
onSelectionChange();
item.group.scrollIntoView(item);
getScroller().scrollIntoView(item);
return true;
}
@Override @Override
public void scrollSelectionIntoView() { public void scrollSelectionIntoView() {
if (selectedIndices.isEmpty()) { return; } if (selectedIndices.isEmpty()) { return; }
@@ -782,57 +825,19 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
btnExpandCollapseAll.updateIsAllCollapsed(); btnExpandCollapseAll.updateIsAllCollapsed();
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);
}
else if (count == 1) {
selectItem(getItemAtPoint(x + getLeft(), y + getTop()));
}
else if (count == 2) {
ItemInfo item = getItemAtPoint(x + getLeft(), y + getTop());
if (item != null && item.selected) {
itemManager.activateSelectedItems();
}
}
return true;
}
@Override
public boolean longPress(float x, float y) {
ItemInfo item = getItemAtPoint(x + getLeft(), y + getTop());
selectItem(item);
if (item != null && item.item instanceof IPaperCard) {
CardZoom.show(Card.getCardForUi((IPaperCard) item.item));
return true; return true;
} }
return false; return false;
} }
private boolean selectItem(ItemInfo item) { @Override
if (item == null) { public boolean longPress(float x, float y) {
if (!KeyInputAdapter.isCtrlKeyDown() && !KeyInputAdapter.isShiftKeyDown()) { ItemInfo item = getItemAtPoint(x + getLeft(), y + getTop());
clearSelection(); if (item != null && item.item instanceof IPaperCard) {
onSelectionChange(); CardZoom.show(Card.getCardForUi((IPaperCard) item.item));
} return true;
return false;
} }
return false;
if (item.selected) {
if (KeyInputAdapter.isCtrlKeyDown()) {
item.selected = false;
selectedIndices.remove((Object)item.index);
onSelectionChange();
item.group.scrollIntoView(item);
return true;
}
}
if (!allowMultipleSelections || (!KeyInputAdapter.isCtrlKeyDown() && !KeyInputAdapter.isShiftKeyDown())) {
clearSelection();
}
selectedIndices.add(0, item.index);
item.selected = true;
onSelectionChange();
item.group.scrollIntoView(item);
getScroller().scrollIntoView(item);
return true;
} }
//provide special override for this function to account for special ItemInfo positioning logic //provide special override for this function to account for special ItemInfo positioning logic

8
forge-gui-mobile/src/forge/itemmanager/views/ItemView.java
View File

@@ -53,12 +53,20 @@ public abstract class ItemView<T extends InventoryItem> {
return new ScrollBounds(visibleWidth, ItemView.this.getScrollHeight()); return new ScrollBounds(visibleWidth, ItemView.this.getScrollHeight());
} }
@Override
public boolean tap(float x, float y, int count) {
return onScrollerTap(x, y, count);
}
@Override @Override
public void drawOverlay(Graphics g) { public void drawOverlay(Graphics g) {
g.drawRect(1.5f, BORDER_COLOR, 0, 0, getWidth(), getHeight()); g.drawRect(1.5f, BORDER_COLOR, 0, 0, getWidth(), getHeight());
} }
} }
protected boolean onScrollerTap(float x, float y, int count) {
return false;
}
protected abstract float getScrollHeight(); protected abstract float getScrollHeight();
protected abstract float layoutOptionsPanel(float visibleWidth, float height); protected abstract float layoutOptionsPanel(float visibleWidth, float height);