From 1c2c3d6d511e461e0632a4731c02bb6d3eda99b3 Mon Sep 17 00:00:00 2001 From: drdev Date: Mon, 11 Nov 2013 02:55:18 +0000 Subject: [PATCH] Ensure first ability selected in menu by default --- .../java/forge/game/player/PlayerControllerHuman.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/forge-gui/src/main/java/forge/game/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/game/player/PlayerControllerHuman.java index cb40d01aa90..de022b5b4e2 100644 --- a/forge-gui/src/main/java/forge/game/player/PlayerControllerHuman.java +++ b/forge-gui/src/main/java/forge/game/player/PlayerControllerHuman.java @@ -11,6 +11,9 @@ import java.util.Map; import javax.swing.JOptionPane; import javax.swing.JPopupMenu; import javax.swing.KeyStroke; +import javax.swing.MenuElement; +import javax.swing.MenuSelectionManager; +import javax.swing.SwingUtilities; import org.apache.commons.lang.math.IntRange; import org.apache.commons.lang3.StringUtils; @@ -136,6 +139,11 @@ public class PlayerControllerHuman extends PlayerController { } } if (hasEnabled) { //only show menu if at least one ability can be played + SwingUtilities.invokeLater(new Runnable() { //use invoke later to ensure first ability selected by default + public void run() { + MenuSelectionManager.defaultManager().setSelectedPath(new MenuElement[]{menu, menu.getSubElements()[0]}); + } + }); menu.show(triggerEvent.getComponent(), triggerEvent.getX(), triggerEvent.getY()); }