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

Merge remote-tracking branch 'core/master' into AdventureModePort

Browse Source
This commit is contained in:
Anthony Calosa
2022-02-09 12:08:25 +08:00
parent 859edf866a 7499bddbb4
commit 91ae181afc
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
View File

@@ -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;

2
forge-gui-mobile/src/forge/deck/FDeckChooser.java
View File

@@ -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) {

7
forge-gui-mobile/src/forge/toolbox/FComboBox.java
View File

@@ -188,6 +188,13 @@ public class FComboBox<T> extends FTextField implements IComboBox<T> {
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;
}