From 2a604e9d1311aa2e103b725fa35c05f183b207c4 Mon Sep 17 00:00:00 2001 From: Zachary Kline Date: Sun, 28 Jun 2020 03:46:49 -0700 Subject: [PATCH 1/4] Make browsing the deck editor a little more keyboard friendly. --- .../main/java/forge/screens/deckeditor/CDeckEditorUI.java | 8 ++++++-- .../screens/deckeditor/controllers/ACEditorBase.java | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/CDeckEditorUI.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/CDeckEditorUI.java index 80f2ac05ea1..be7750966f8 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/CDeckEditorUI.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/CDeckEditorUI.java @@ -224,8 +224,10 @@ public enum CDeckEditorUI implements ICDoc { addSelectedCards(e.isControlDown() || e.isMetaDown(), e.isShiftDown() ? 4: 1); } else if (KeyEvent.VK_LEFT == e.getKeyCode() || KeyEvent.VK_RIGHT == e.getKeyCode()) { + if (e.isControlDown() || e.isMetaDown()) { deckView.focus(); e.consume(); //prevent losing selection +} } } }); @@ -236,8 +238,10 @@ public enum CDeckEditorUI implements ICDoc { removeSelectedCards(e.isControlDown() || e.isMetaDown(), e.isShiftDown() ? 4: 1); } else if (KeyEvent.VK_LEFT == e.getKeyCode() || KeyEvent.VK_RIGHT == e.getKeyCode()) { - catView.focus(); - e.consume(); //prevent losing selection + if (e.isControlDown() || e.isMetaDown()) { + catView.focus(); + e.consume(); //prevent losing selection + } } else if (KeyEvent.VK_F == e.getKeyCode()) { // let ctrl/cmd-F set focus to the text filter box diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java index 3bd75e1d858..2ad7fa6106f 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java @@ -458,7 +458,7 @@ public abstract class ACEditorBase Date: Mon, 29 Jun 2020 12:31:04 -0700 Subject: [PATCH 2/4] Add announcement about the keyboard change. --- forge-gui/release-files/ANNOUNCEMENTS.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/forge-gui/release-files/ANNOUNCEMENTS.txt b/forge-gui/release-files/ANNOUNCEMENTS.txt index c797a1dcaff..69a9880567c 100644 --- a/forge-gui/release-files/ANNOUNCEMENTS.txt +++ b/forge-gui/release-files/ANNOUNCEMENTS.txt @@ -1,5 +1,2 @@ #Add one announcement per line -IKO Release. Sorry Companions and Mutate will take some more time. They are still very much on the radar. -We believe the issue with 1.8.0_211 or greater have been resolved. Let us know if you are still on the latest version and things are better now. -[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]! \ No newline at end of file +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. From 126152d6381200fdeaa62cc57c3d6651b5ff86e2 Mon Sep 17 00:00:00 2001 From: Zachary Kline Date: Sun, 28 Jun 2020 03:46:49 -0700 Subject: [PATCH 3/4] Make browsing the deck editor a little more keyboard friendly. --- .../main/java/forge/screens/deckeditor/CDeckEditorUI.java | 8 ++++++-- .../screens/deckeditor/controllers/ACEditorBase.java | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/CDeckEditorUI.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/CDeckEditorUI.java index 80f2ac05ea1..be7750966f8 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/CDeckEditorUI.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/CDeckEditorUI.java @@ -224,8 +224,10 @@ public enum CDeckEditorUI implements ICDoc { addSelectedCards(e.isControlDown() || e.isMetaDown(), e.isShiftDown() ? 4: 1); } else if (KeyEvent.VK_LEFT == e.getKeyCode() || KeyEvent.VK_RIGHT == e.getKeyCode()) { + if (e.isControlDown() || e.isMetaDown()) { deckView.focus(); e.consume(); //prevent losing selection +} } } }); @@ -236,8 +238,10 @@ public enum CDeckEditorUI implements ICDoc { removeSelectedCards(e.isControlDown() || e.isMetaDown(), e.isShiftDown() ? 4: 1); } else if (KeyEvent.VK_LEFT == e.getKeyCode() || KeyEvent.VK_RIGHT == e.getKeyCode()) { - catView.focus(); - e.consume(); //prevent losing selection + if (e.isControlDown() || e.isMetaDown()) { + catView.focus(); + e.consume(); //prevent losing selection + } } else if (KeyEvent.VK_F == e.getKeyCode()) { // let ctrl/cmd-F set focus to the text filter box diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java index 3bd75e1d858..2ad7fa6106f 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java @@ -458,7 +458,7 @@ public abstract class ACEditorBase Date: Mon, 29 Jun 2020 12:31:04 -0700 Subject: [PATCH 4/4] Add announcement about the keyboard change. --- forge-gui/release-files/ANNOUNCEMENTS.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/forge-gui/release-files/ANNOUNCEMENTS.txt b/forge-gui/release-files/ANNOUNCEMENTS.txt index 5c195ff539f..69a9880567c 100644 --- a/forge-gui/release-files/ANNOUNCEMENTS.txt +++ b/forge-gui/release-files/ANNOUNCEMENTS.txt @@ -1,6 +1,2 @@ #Add one announcement per line -M21 Pre-release. -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]! \ No newline at end of file +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.