Browse Source

Harmonize keymaps a bit

Tobias Hieta 8 years ago
parent
commit
ac5849f6f5
2 changed files with 21 additions and 2 deletions
  1. 1 0
      resources/inputmaps/keyboard.json
  2. 20 2
      src/ui/webview.qml

+ 1 - 0
resources/inputmaps/keyboard.json

@@ -50,6 +50,7 @@
 
     // application shortcuts
     "Ctrl\\+Shift\\+F": "host:fullscreen",
+    "Meta\\+Ctrl\\+F": "host:fullscreen",
     "Ctrl\\+Q": "host:close",
     "Ctrl\\+Shift\\+R": "host:reload",
     "Ctrl\\+Shift\\+D": "host:toggleDebug",

+ 20 - 2
src/ui/webview.qml

@@ -28,12 +28,20 @@ KonvergoWindow
     action_undo.enabled = enable
     action_redo.enabled = enable
     action_selectall.enabled = enable
-    action_fullscreen.enabled = enable
+    action_fullscreen_win.enabled = enable
+    action_fullscreen_mac.enabled = enable
   }
 
   Action
   {
-    id: action_fullscreen
+    id: action_debug_overlay
+    shortcut: "Ctrl+Shift+D"
+    onTriggered: mainWindow.toggleDebug()
+  }
+
+  Action
+  {
+    id: action_fullscreen_win
     shortcut: "F11"
     onTriggered:
     {
@@ -41,6 +49,16 @@ KonvergoWindow
     }
   }
 
+  Action
+  {
+    id: action_fullscreen_mac
+    shortcut: "Ctrl+Meta+F"
+    onTriggered:
+    {
+      mainWindow.toggleFullscreen()
+    }
+  }
+
   Action
   {
     id: action_switchmode