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

*Only register a mouse listener on the stack objects that are from optional trigger objects.

Browse Source 
*Mark stack items from optional trigger objects.
This commit is contained in:
Hellfish
2011-09-15 10:17:34 +00:00
parent aa2d173506
commit 36f9a36f45
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/forge/GuiDisplay4.java
View File

@@ -729,7 +729,8 @@ public class GuiDisplay4 extends JFrame implements CardContainer, Display, NewCo
for (int i = stack.size() - 1; 0 <= i; i--) { for (int i = stack.size() - 1; 0 <= i; i--) {
final int curI = i; final int curI = i;
label = new JLabel("" + (count++) + ". " + stack.peekInstance(i).getStackDescription()); String isOptional = stack.peekAbility(i).isOptionalTrigger() && stack.peekAbility(i).getSourceCard().getController().isHuman() ? "(OPTIONAL) " : "";
label = new JLabel(isOptional + (count++) + ". " + stack.peekInstance(i).getStackDescription());
//update card detail //update card detail
final CardPanel cardPanel = new CardPanel(stack.peekInstance().getSpellAbility().getSourceCard()); final CardPanel cardPanel = new CardPanel(stack.peekInstance().getSpellAbility().getSourceCard());
@@ -743,21 +744,21 @@ public class GuiDisplay4 extends JFrame implements CardContainer, Display, NewCo
} //mouseMoved } //mouseMoved
}); });
cardPanel.addMouseListener(new MouseAdapter() { if(stack.peekInstance(curI).isOptionalTrigger())
@Override {
public void mousePressed(final MouseEvent e) { cardPanel.addMouseListener(new MouseAdapter() {
if(e.getButton() != MouseEvent.BUTTON3) @Override
{ public void mousePressed(final MouseEvent e) {
return; if(e.getButton() != MouseEvent.BUTTON3)
{
return;
}
triggerMenu.setTrigger(stack.peekAbility(curI).getSourceTrigger());
triggerMenu.show(e.getComponent(),e.getX(),e.getY());
} }
if(!stack.peekInstance(curI).isOptionalTrigger()) });
{ }
return;
}
triggerMenu.setTrigger(stack.peekAbility(curI).getSourceTrigger());
triggerMenu.show(e.getComponent(),e.getX(),e.getY());
}
});
stackPanel.add(cardPanel); stackPanel.add(cardPanel);
} }