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

- Fixed an issue with non-creature tokens being added twice to different rows, resulting in odd Z order when mousing over them.

Browse Source
This commit is contained in:
Agetian
2017-08-29 09:03:36 +00:00
parent 4c31e1a4b5
commit 65c27c6c93
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-gui-desktop/src/main/java/forge/view/arcane/PlayArea.java
View File

@@ -273,8 +273,6 @@ public class PlayArea extends CardPanelContainer implements CardPanelMouseListen
if (!s.isEmpty()) { if (!s.isEmpty()) {
if (s.get(0).getCard().getCurrentState().isCreature()) { if (s.get(0).getCard().getCurrentState().isCreature()) {
creatures.add(s); creatures.add(s);
} else {
others.add(s);
} }
} }
} }
@@ -361,6 +359,7 @@ public class PlayArea extends CardPanelContainer implements CardPanelMouseListen
for (int panelIndex = 0, panelCount = stack.size(); panelIndex < panelCount; panelIndex++) { for (int panelIndex = 0, panelCount = stack.size(); panelIndex < panelCount; panelIndex++) {
final CardPanel panel = stack.get(panelIndex); final CardPanel panel = stack.get(panelIndex);
final int stackPosition = panelCount - panelIndex - 1; final int stackPosition = panelCount - panelIndex - 1;
System.out.println("Added " + stack.get(panelIndex).getCard() + " as position " + stackPosition + ", stack size = " + stack.size());
this.setComponentZOrder(panel, panelIndex); this.setComponentZOrder(panel, panelIndex);
final int panelX = x + (stackPosition * this.stackSpacingX); final int panelX = x + (stackPosition * this.stackSpacingX);
final int panelY = y + (stackPosition * this.stackSpacingY); final int panelY = y + (stackPosition * this.stackSpacingY);