diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java index 1f954bcd89b..e4e903a1be7 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java @@ -38,7 +38,6 @@ import forge.game.player.PlayerCollection; import forge.game.player.PlayerView; import forge.game.replacement.ReplacementEffect; import forge.game.replacement.ReplacementType; -import forge.game.spellability.AbilitySub; import forge.game.spellability.SpellAbility; import forge.game.spellability.SpellAbilityStackInstance; import forge.game.trigger.TriggerType; diff --git a/forge-gui-mobile/src/forge/deck/FDeckChooser.java b/forge-gui-mobile/src/forge/deck/FDeckChooser.java index e3c71ec8eef..d589087f25f 100644 --- a/forge-gui-mobile/src/forge/deck/FDeckChooser.java +++ b/forge-gui-mobile/src/forge/deck/FDeckChooser.java @@ -236,6 +236,8 @@ public class FDeckChooser extends FScreen { @Override public void onActivate() { + if (cmbDeckTypes != null && cmbDeckTypes.getDropDownisVisible()) + cmbDeckTypes.hideDropDown(); String selectedDeck = ""; int index = 0; if (lstDecks.getSelectedItem() != null) { diff --git a/forge-gui-mobile/src/forge/toolbox/FComboBox.java b/forge-gui-mobile/src/forge/toolbox/FComboBox.java index 2be4c134f3b..2a2a863157d 100644 --- a/forge-gui-mobile/src/forge/toolbox/FComboBox.java +++ b/forge-gui-mobile/src/forge/toolbox/FComboBox.java @@ -188,6 +188,13 @@ public class FComboBox extends FTextField implements IComboBox { public FEventHandler getDropDownChangeHandler() { return dropDownChangeHandler; } + public boolean getDropDownisVisible() { + return dropDown != null && dropDown.isVisible(); + } + public void hideDropDown() { + if (dropDown != null) + dropDown.hide(); + } public void setDropDownChangeHandler(FEventHandler changedHandler0) { dropDownChangeHandler = changedHandler0; }