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

Close loophole where ability menu could remain open when advancing phases, allowing playing cards when you shouldn't be able to

Browse Source
This commit is contained in:
drdev
2015-10-10 17:54:10 +00:00
parent 6231dda747
commit c55a4a49ba
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java
View File

@@ -33,6 +33,8 @@ import javax.swing.JMenu;
import javax.swing.JPopupMenu; import javax.swing.JPopupMenu;
import javax.swing.KeyStroke; import javax.swing.KeyStroke;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import javax.swing.event.PopupMenuEvent;
import javax.swing.event.PopupMenuListener;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
@@ -125,6 +127,7 @@ public final class CMatchUI
private final Map<String, String> avatarImages = new HashMap<String, String>(); private final Map<String, String> avatarImages = new HashMap<String, String>();
private boolean allHands; private boolean allHands;
private boolean showOverlay = true; private boolean showOverlay = true;
private JPopupMenu openAbilityMenu;
private IVDoc<? extends ICDoc> selectedDocBeforeCombat; private IVDoc<? extends ICDoc> selectedDocBeforeCombat;
@@ -596,6 +599,10 @@ public final class CMatchUI
if (lbl != null) { if (lbl != null) {
lbl.setActive(true); lbl.setActive(true);
} }
if (openAbilityMenu != null) { //ensure ability menu can't remain open between phases
openAbilityMenu.setVisible(false);
}
} }
@Override @Override
@@ -748,7 +755,21 @@ public final class CMatchUI
x = triggerEvent.getX(); x = triggerEvent.getX();
y = triggerEvent.getY(); y = triggerEvent.getY();
} }
menu.addPopupMenuListener(new PopupMenuListener() {
@Override
public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
}
@Override
public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
openAbilityMenu = null;
}
@Override
public void popupMenuCanceled(PopupMenuEvent e) {
openAbilityMenu = null;
}
});
menu.show(menuParent, x, y); menu.show(menuParent, x, y);
openAbilityMenu = menu;
final int _firstEnabled = firstEnabled; final int _firstEnabled = firstEnabled;
SwingUtilities.invokeLater(new Runnable() { //use invoke later to ensure first enabled ability selected by default SwingUtilities.invokeLater(new Runnable() { //use invoke later to ensure first enabled ability selected by default