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

Fix unselecting or zooming selected items in image view

Browse Source
This commit is contained in:
drdev
2014-05-25 15:26:14 +00:00
parent 984a01ed68
commit a9fd423482
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,7 @@ import forge.assets.FSkinImage;
import forge.assets.FSkinColor.Colors; import forge.assets.FSkinColor.Colors;
import forge.assets.FSkinFont; import forge.assets.FSkinFont;
import forge.assets.ImageCache; import forge.assets.ImageCache;
import forge.card.CardRenderer;
import forge.card.CardZoom; import forge.card.CardZoom;
import forge.deck.DeckProxy; import forge.deck.DeckProxy;
import forge.game.card.Card; import forge.game.card.Card;
@@ -580,6 +581,16 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
} }
private ItemInfo getItemAtPoint(float x, float y) { private ItemInfo getItemAtPoint(float x, float y) {
//check selected items first since they appear on top
for (int i = selectedIndices.size() - 1; i >= 0; i--) {
ItemInfo item = orderedItems.get(selectedIndices.get(i));
float relX = x + item.group.getScrollLeft() - item.group.getLeft();
float relY = y + getScrollValue();
if (item.contains(relX, relY)) {
return item;
}
}
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);
if (!group.isCollapsed) { if (!group.isCollapsed) {
@@ -946,16 +957,16 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
} }
//draw foil effect if needed //draw foil effect if needed
/*if (item instanceof IPaperCard) { if (item instanceof IPaperCard) {
IPaperCard paperCard = (IPaperCard)item; IPaperCard paperCard = (IPaperCard)item;
if (paperCard.isFoil()) { if (paperCard.isFoil()) {
Card card = Card.getCardForUi(paperCard); Card card = Card.getCardForUi(paperCard);
if (card.getFoil() == 0) { //if foil finish not yet established, assign a random one if (card.getFoil() == 0) { //if foil finish not yet established, assign a random one
card.setRandomFoil(); card.setRandomFoil();
} }
CardPanel.drawFoilEffect(g, card, getLeft(), getTop(), getWidth(), getHeight(), borderSize); CardRenderer.drawFoilEffect(g, card, getLeft(), getTop(), getWidth(), getHeight());
} }
}*/ }
} }
} }
} }