From 3b97f8c396d0dc771f65d5ffa7795841909e1fb1 Mon Sep 17 00:00:00 2001 From: Agetian Date: Thu, 14 Sep 2017 09:42:17 +0000 Subject: [PATCH] - 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). --- .../screens/match/winlose/ViewWinLose.java | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java b/forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java index ea8a894186e..75dde34a596 100644 --- a/forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java +++ b/forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java @@ -1,13 +1,7 @@ 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.graphics.g2d.BitmapFont.HAlignment; - import forge.FThreads; import forge.Forge; import forge.assets.FSkinColor; @@ -21,17 +15,15 @@ import forge.interfaces.IWinLoseView; import forge.item.PaperCard; import forge.menu.FMagnifyView; import forge.model.FModel; -import forge.toolbox.FButton; -import forge.toolbox.FContainer; -import forge.toolbox.FDisplayObject; -import forge.toolbox.FEvent; +import forge.toolbox.*; import forge.toolbox.FEvent.FEventHandler; -import forge.toolbox.FLabel; -import forge.toolbox.FOverlay; -import forge.toolbox.FTextArea; +import forge.util.TextUtil; import forge.util.Utils; import forge.util.gui.SGuiChoose; import forge.util.gui.SOptionPane; +import org.apache.commons.lang3.StringUtils; + +import java.util.List; public class ViewWinLose extends FOverlay implements IWinLoseView { private static final float INSETS_FACTOR = 0.025f; @@ -220,6 +212,13 @@ public class ViewWinLose extends FOverlay implements IWinLoseView { if (keyCode == Keys.ESCAPE || keyCode == Keys.BACK) { btnQuit.trigger(); //quit on escape or back return true; + } else if (keyCode == Keys.SPACE || keyCode == Keys.ENTER) { + if (btnContinue.isEnabled()) { + btnContinue.trigger(); + } else { + btnQuit.trigger(); + } + return true; } return super.keyDown(keyCode); }