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

Prevent showing menu if overlay open

Browse Source
This commit is contained in:
drdev
2014-05-14 00:03:24 +00:00
parent ce0eb099ee
commit 499ae40026
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui-mobile/src/forge/Forge.java
View File

@@ -109,8 +109,10 @@ public class Forge implements ApplicationListener {
public static void showMenu() { public static void showMenu() {
if (currentScreen == null) { return; } if (currentScreen == null) { return; }
endKeyInput(); //end key input before menu shown endKeyInput(); //end key input before menu shown
if (FOverlay.getTopOverlay() == null) { //don't show menu if overlay open
currentScreen.showMenu(); currentScreen.showMenu();
} }
}
public static void back() { public static void back() {
if (screens.size() < 2) { return; } //don't allow going back from initial screen if (screens.size() < 2) { return; } //don't allow going back from initial screen

2
forge-gui-mobile/src/forge/screens/match/MatchScreen.java
View File

@@ -182,7 +182,7 @@ public class MatchScreen extends FScreen {
case Keys.ESCAPE: case Keys.ESCAPE:
return prompt.getBtnCancel().trigger(); //otherwise trigger Cancel return prompt.getBtnCancel().trigger(); //otherwise trigger Cancel
case Keys.BACK: case Keys.BACK:
FControl.undoLastAction(); //let back trigger undo instead of going back a screen FControl.undoLastAction(); //let Back trigger undo instead of going back a screen
return true; return true;
case Keys.A: //alpha strike on Ctrl+A case Keys.A: //alpha strike on Ctrl+A
if (KeyInputAdapter.isCtrlKeyDown()) { if (KeyInputAdapter.isCtrlKeyDown()) {