External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 04:22:01 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* UI: choose modes dialog improves:

Browse source 
* Added hotkeys to select options (1-9 for choice, SPACE/ENTER for done, ESC for cancel);
 * "Up to" modes choose dialog - added "done" button in dialog;
 * "Up to" modes choose dialog - fixed that user can't cancel if already selected one mode;
 * Added extra info about source object, selected and remaining modes to select, ability number for hotkey;
 * Fixed that mode choose dialog doesn't close on cancel (#6199);
This commit is contained in:
Oleg Agafonov 2020-01-18 06:30:44 +04:00
parent cf97b9e6c7
commit 8add25fa12
6 changed files with 179 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Mage.Common/src/main/java/mage/view/AbilityPickerView.java
View file

@ -1,15 +1,14 @@
package mage.view;
import mage.abilities.Ability;
import java.io.Serializable;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import mage.abilities.Ability;
/**
*
* @author BetaSteward_at_googlemail.com
*/
public class AbilityPickerView implements Serializable {
@ -17,6 +16,7 @@ public class AbilityPickerView implements Serializable {
private static final long serialVersionUID = 1L;
private Map<UUID, String> choices = new LinkedHashMap<>();
private String message = null;
public AbilityPickerView(String objectName, List<? extends Ability> abilities) {
for (Ability ability : abilities) {
@ -32,11 +32,16 @@ public class AbilityPickerView implements Serializable {
}
}
public AbilityPickerView(Map<UUID, String> modes) {
public AbilityPickerView(Map<UUID, String> modes, String message) {
this.choices = modes;
this.message = message;
}
public Map<UUID, String> getChoices() {
return choices;
}
public String getMessage() {
return message;
}
}