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 branch 'DeckEditorKeyboardAccess' into 'master'

Browse Source 
Improved Deck Editor keyboard ACcess

Closes #1465

See merge request core-developers/forge!2926
This commit is contained in:
Michael Kamensky
2020-06-30 03:56:52 +00:00
parent 8af416a13b b7b36c7d03
commit 40b23e76a2
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-gui-desktop/src/main/java/forge/screens/deckeditor/CDeckEditorUI.java
View File

@@ -224,8 +224,10 @@ public enum CDeckEditorUI implements ICDoc {
addSelectedCards(e.isControlDown() || e.isMetaDown(), e.isShiftDown() ? 4: 1); addSelectedCards(e.isControlDown() || e.isMetaDown(), e.isShiftDown() ? 4: 1);
} }
else if (KeyEvent.VK_LEFT == e.getKeyCode() || KeyEvent.VK_RIGHT == e.getKeyCode()) { else if (KeyEvent.VK_LEFT == e.getKeyCode() || KeyEvent.VK_RIGHT == e.getKeyCode()) {
if (e.isControlDown() || e.isMetaDown()) {
deckView.focus(); deckView.focus();
e.consume(); //prevent losing selection e.consume(); //prevent losing selection
}
} }
} }
}); });
@@ -236,8 +238,10 @@ public enum CDeckEditorUI implements ICDoc {
removeSelectedCards(e.isControlDown() || e.isMetaDown(), e.isShiftDown() ? 4: 1); removeSelectedCards(e.isControlDown() || e.isMetaDown(), e.isShiftDown() ? 4: 1);
} }
else if (KeyEvent.VK_LEFT == e.getKeyCode() || KeyEvent.VK_RIGHT == e.getKeyCode()) { else if (KeyEvent.VK_LEFT == e.getKeyCode() || KeyEvent.VK_RIGHT == e.getKeyCode()) {
catView.focus(); if (e.isControlDown() || e.isMetaDown()) {
e.consume(); //prevent losing selection catView.focus();
e.consume(); //prevent losing selection
}
} }
else if (KeyEvent.VK_F == e.getKeyCode()) { else if (KeyEvent.VK_F == e.getKeyCode()) {
// let ctrl/cmd-F set focus to the text filter box // let ctrl/cmd-F set focus to the text filter box

4
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java
View File

@@ -458,7 +458,7 @@ public abstract class ACEditorBase<TItem extends InventoryItem, TModel extends D
} }
GuiUtils.addMenuItem(menu, localizer.getMessage("lblJumptoprevioustable"), GuiUtils.addMenuItem(menu, localizer.getMessage("lblJumptoprevioustable"),
KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, 0), KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, InputEvent.META_DOWN_MASK | InputEvent.CTRL_DOWN_MASK),
new Runnable() { new Runnable() {
@Override @Override
public void run() { public void run() {
@@ -466,7 +466,7 @@ public abstract class ACEditorBase<TItem extends InventoryItem, TModel extends D
} }
}); });
GuiUtils.addMenuItem(menu, localizer.getMessage("lblJumptopnexttable"), GuiUtils.addMenuItem(menu, localizer.getMessage("lblJumptopnexttable"),
KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, 0), KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, InputEvent.META_DOWN_MASK | InputEvent.CTRL_DOWN_MASK),
new Runnable() { new Runnable() {
@Override @Override
public void run() { public void run() {

6
forge-gui/release-files/ANNOUNCEMENTS.txt
View File

@@ -1,6 +1,2 @@
#Add one announcement per line #Add one announcement per line
M21 Pre-release. Keyboard shortcut change: to help improve accessibility, the arrow key shortcuts to move between deck editor tables now require control or Command, depending on which platform you're on.
Mutate is NOT finished yet. Please be patient.
Companion is in, but unfortunately Wizards changed the rules on us. We'll get the new rules in when we can.
[b]Forge now requires Java 8 (or newer). You will not be able to start the game if you are not yet running Java 8.[/b]
We have a Discord server for hanging out with Forge devs and other Forge fans. Feel free to [url=https://discord.gg/3v9JCVr]jump on in and say hi[/url]!