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

* UI: fixed that some user defined hotkeys can be broken after last update;

Browse source
This commit is contained in:
Oleg Agafonov 2020-01-18 20:37:00 +04:00
parent 17c7ea63ba
commit 2249bba1f1
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Mage.Client/src/main/java/mage/client/game/GamePanel.java
View file

@ -1822,6 +1822,10 @@ public final class GamePanel extends javax.swing.JPanel {
// HOTKEYS // HOTKEYS
// special hotkeys for custom rendered dialogs without focus
// call it before any user defined hotkeys
this.abilityPicker.injectHotkeys(this, "ABILITY_PICKER");
KeyStroke ks2 = getCachedKeystroke(KEY_CONTROL_CONFIRM); KeyStroke ks2 = getCachedKeystroke(KEY_CONTROL_CONFIRM);
this.getInputMap(c).put(ks2, "F2_PRESS"); this.getInputMap(c).put(ks2, "F2_PRESS");
this.getActionMap().put("F2_PRESS", new AbstractAction() { this.getActionMap().put("F2_PRESS", new AbstractAction() {
@ -1902,9 +1906,6 @@ public final class GamePanel extends javax.swing.JPanel {
} }
}); });
// special hotkeys for custom rendered dialogs without focus
this.abilityPicker.injectHotkeys(this, "ABILITY_PICKER");
final BasicSplitPaneUI myUi = (BasicSplitPaneUI) jSplitPane0.getUI(); final BasicSplitPaneUI myUi = (BasicSplitPaneUI) jSplitPane0.getUI();
final BasicSplitPaneDivider divider = myUi.getDivider(); final BasicSplitPaneDivider divider = myUi.getDivider();
final JButton upArrowButton = (JButton) divider.getComponent(0); final JButton upArrowButton = (JButton) divider.getComponent(0);