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