Fix mac keybinding by replacing ctrl it with meta key (#3000)

Remoce spaces
JabRef · Jul 12, 2017 · f23db0e · f23db0e
1 parent e35b6ac
commit f23db0e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBindingRepository.java b/src/main/java/org/jabref/gui/keyboard/KeyBindingRepository.java
@@ -155,6 +155,10 @@ public KeyStroke getKey(KeyBinding bindName) {
 
     private KeyCombination getKeyCombination(KeyBinding bindName) {
         String binding = get(bindName.getConstant());
+        if (OS.OS_X) {
+            binding = binding.replace("ctrl", "meta");
+        }
+
         return KeyCombination.valueOf(binding);
     }
 

diff --git a/src/test/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModelTest.java b/src/test/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModelTest.java
@@ -14,7 +14,6 @@
 
 import org.junit.Before;
 import org.junit.Test;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
@@ -175,13 +174,10 @@ public void testSetSingleKeyBindingToDefault() {
 
     @Test
     public void testConversionAwtKeyEventJavafxKeyEvent() {
-
-
         java.awt.event.KeyEvent evt = new java.awt.event.KeyEvent(mock(JFrame.class), 0, 0, InputEvent.CTRL_MASK, java.awt.event.KeyEvent.VK_S, java.awt.event.KeyEvent.CHAR_UNDEFINED);
 
         Optional<KeyBinding> keyBinding = keyBindingRepository.mapToKeyBinding(evt);
         assertEquals(Optional.of(KeyBinding.SAVE_DATABASE), keyBinding);
-
     }
 
     private KeyBindingViewModel setKeyBindingViewModel(KeyBinding binding) {