github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-28 19:19:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

UI: changed ESC to BACKSPACE in choose dialog hotkeys (compatibility fixes);

Browse source
This commit is contained in:
Oleg Agafonov 2020-01-18 09:34:02 +04:00
parent ce60a9d75b
commit 7da62e13ec
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Mage.Client/src/main/java/mage/client/components/ability/AbilityPicker.java
View file

@ -500,6 +500,7 @@ public class AbilityPicker extends JXPanel implements MouseWheelListener {
AbilityPickerAction action = (AbilityPickerAction) obj; AbilityPickerAction action = (AbilityPickerAction) obj;
if (action.id == null) { if (action.id == null) {
cancel(); cancel();
break;
} }
} }
} }
@ -555,8 +556,8 @@ public class AbilityPicker extends JXPanel implements MouseWheelListener {
} }
}); });
// cancel key (esc) // cancel key (esc can be lost by focus on exile window popup)
panel.getInputMap(c).put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), commandsPrefix + "_CHOOSE_CANCEL"); panel.getInputMap(c).put(KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SPACE, 0), commandsPrefix + "_CHOOSE_CANCEL");
panel.getActionMap().put(commandsPrefix + "_CHOOSE_CANCEL", new AbstractAction() { panel.getActionMap().put(commandsPrefix + "_CHOOSE_CANCEL", new AbstractAction() {
@Override @Override
public void actionPerformed(ActionEvent actionEvent) { public void actionPerformed(ActionEvent actionEvent) {

1
Mage.Client/src/main/java/mage/client/dialog/CardInfoWindowDialog.java
View file

@ -77,7 +77,6 @@ public class CardInfoWindowDialog extends MageDialog {
} }
this.setTitelBarToolTip(name); this.setTitelBarToolTip(name);
setGUISize(); setGUISize();
} }
public void cleanUp() { public void cleanUp() {