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

- Mobile Forge: fixed a long-standing bug which caused a match (e.g. Planar Conquest) to restart even after a victory when using Space or Enter shortcut keys (when running on PC or when using buttons on a mobile device that are bound to Space and/or Enter).

Browse Source
This commit is contained in:
Agetian
2017-09-14 09:42:17 +00:00
parent e7a559327c
commit 3b97f8c396
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java
View File

@@ -1,13 +1,7 @@
package forge.screens.match.winlose; package forge.screens.match.winlose;
import java.util.List;
import forge.util.TextUtil;
import org.apache.commons.lang3.StringUtils;
import com.badlogic.gdx.Input.Keys; import com.badlogic.gdx.Input.Keys;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment;
import forge.FThreads; import forge.FThreads;
import forge.Forge; import forge.Forge;
import forge.assets.FSkinColor; import forge.assets.FSkinColor;
@@ -21,17 +15,15 @@ import forge.interfaces.IWinLoseView;
import forge.item.PaperCard; import forge.item.PaperCard;
import forge.menu.FMagnifyView; import forge.menu.FMagnifyView;
import forge.model.FModel; import forge.model.FModel;
import forge.toolbox.FButton; import forge.toolbox.*;
import forge.toolbox.FContainer;
import forge.toolbox.FDisplayObject;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler; import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel; import forge.util.TextUtil;
import forge.toolbox.FOverlay;
import forge.toolbox.FTextArea;
import forge.util.Utils; import forge.util.Utils;
import forge.util.gui.SGuiChoose; import forge.util.gui.SGuiChoose;
import forge.util.gui.SOptionPane; import forge.util.gui.SOptionPane;
import org.apache.commons.lang3.StringUtils;
import java.util.List;
public class ViewWinLose extends FOverlay implements IWinLoseView<FButton> { public class ViewWinLose extends FOverlay implements IWinLoseView<FButton> {
private static final float INSETS_FACTOR = 0.025f; private static final float INSETS_FACTOR = 0.025f;
@@ -220,6 +212,13 @@ public class ViewWinLose extends FOverlay implements IWinLoseView<FButton> {
if (keyCode == Keys.ESCAPE || keyCode == Keys.BACK) { if (keyCode == Keys.ESCAPE || keyCode == Keys.BACK) {
btnQuit.trigger(); //quit on escape or back btnQuit.trigger(); //quit on escape or back
return true; return true;
} else if (keyCode == Keys.SPACE || keyCode == Keys.ENTER) {
if (btnContinue.isEnabled()) {
btnContinue.trigger();
} else {
btnQuit.trigger();
}
return true;
} }
return super.keyDown(keyCode); return super.keyDown(keyCode);
} }