Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages 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

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

@ -394,7 +394,6 @@ public final class GamePanel extends javax.swing.JPanel {
this.feedbackPanel.init(gameId);
this.feedbackPanel.clear();
this.abilityPicker.init(gameId);
this.btnConcede.setVisible(true);
this.btnStopWatching.setVisible(false);
this.btnSwitchHands.setVisible(false);
@ -1399,6 +1398,8 @@ public final class GamePanel extends javax.swing.JPanel {
}
public void select(String message, GameView gameView, int messageId, Map<String, Serializable> options) {
this.abilityPicker.setVisible(false);
holdingPriority = false;
txtHoldPriority.setVisible(false);
setMenuStates(
@ -1464,6 +1465,7 @@ public final class GamePanel extends javax.swing.JPanel {
}
private void hideAll() {
this.abilityPicker.setVisible(false);
ActionCallback callback = Plugins.instance.getActionCallback();
((MageActionCallback) callback).hideGameUpdate(gameId);
}
@ -1900,6 +1902,9 @@ 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 BasicSplitPaneDivider divider = myUi.getDivider();
final JButton upArrowButton = (JButton) divider.getComponent(0);
@ -2268,6 +2273,10 @@ public final class GamePanel extends javax.swing.JPanel {
for (ComponentListener cl : this.getComponentListeners()) {
this.removeComponentListener(cl);
}
for (KeyListener kl : this.getKeyListeners()) {
this.removeKeyListener(kl);
}
}
private void btnConcedeActionPerformed(java.awt.event.ActionEvent evt) {
@ -2711,5 +2720,4 @@ class ReplayTask extends SwingWorker<Void, Collection<MatchView>> {
} catch (CancellationException ex) {
}
}
}