From afd69d04dd8e05876d3721a3f1f9de0a396f1ad0 Mon Sep 17 00:00:00 2001
From: Thijs Wenker <me@thoys.nl>
Date: Sat, 3 Nov 2018 00:27:03 +0100
Subject: [PATCH] Make ctrl+shift shortcuts work for create app

---
 interface/resources/qml/controls/FlickableWebViewCore.qml | 6 ++++--
 interface/resources/qml/controls/WebView.qml              | 1 +
 interface/resources/qml/hifi/tablet/EditEntityList.qml    | 3 ++-
 interface/resources/qml/hifi/tablet/EditTabView.qml       | 3 +++
 interface/resources/qml/hifi/tablet/EditToolsTabView.qml  | 2 ++
 interface/resources/qml/hifi/tablet/EntityList.qml        | 1 +
 scripts/system/libraries/EditEntityList.qml               | 1 +
 7 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/interface/resources/qml/controls/FlickableWebViewCore.qml b/interface/resources/qml/controls/FlickableWebViewCore.qml
index a89a0cf37b..823d0107a2 100644
--- a/interface/resources/qml/controls/FlickableWebViewCore.qml
+++ b/interface/resources/qml/controls/FlickableWebViewCore.qml
@@ -26,6 +26,8 @@ Item {
 
     property bool interactive: false
 
+    property bool blurOnCtrlShift: true
+
     StylesUIt.HifiConstants {
         id: hifi
     }
@@ -180,8 +182,8 @@ Item {
     }
 
     Keys.onPressed: {
-        if ((event.modifiers & Qt.ShiftModifier) && (event.modifiers & Qt.ControlModifier)) {
-            webViewCore.focus = false;
+        if (blurOnCtrlShift && (event.modifiers & Qt.ShiftModifier) && (event.modifiers & Qt.ControlModifier)) {
+            webViewCore.focus = false; 
         }
     }
 }
diff --git a/interface/resources/qml/controls/WebView.qml b/interface/resources/qml/controls/WebView.qml
index 6d72c529f6..24ea11a906 100644
--- a/interface/resources/qml/controls/WebView.qml
+++ b/interface/resources/qml/controls/WebView.qml
@@ -22,6 +22,7 @@ Item {
     property bool punctuationMode: false
     property bool passwordField: false
     property alias flickable: webroot.interactive
+    property alias blurOnCtrlShift: webroot.blurOnCtrlShift
 
     function stop() {
         webroot.stop();
diff --git a/interface/resources/qml/hifi/tablet/EditEntityList.qml b/interface/resources/qml/hifi/tablet/EditEntityList.qml
index d2fb99ea0a..b6305db388 100644
--- a/interface/resources/qml/hifi/tablet/EditEntityList.qml
+++ b/interface/resources/qml/hifi/tablet/EditEntityList.qml
@@ -10,6 +10,7 @@ import stylesUit 1.0
 
 WebView {
     id: entityListToolWebView
-    url: Paths.defaultScripts + "/system/html/entityList.html"
+    url: Paths.defaultScripts + "/system/html/entityListf.html"
     enabled: true
+    blurOnCtrlShift: false
 }
diff --git a/interface/resources/qml/hifi/tablet/EditTabView.qml b/interface/resources/qml/hifi/tablet/EditTabView.qml
index ff1c5a7c47..5959725a6a 100644
--- a/interface/resources/qml/hifi/tablet/EditTabView.qml
+++ b/interface/resources/qml/hifi/tablet/EditTabView.qml
@@ -245,6 +245,7 @@ TabBar {
                 id: entityListToolWebView
                 url: Paths.defaultScripts + "/system/html/entityList.html"
                 enabled: true
+                blurOnCtrlShift: false
             }
         }
     }
@@ -260,6 +261,7 @@ TabBar {
                 id: entityPropertiesWebView
                 url: Paths.defaultScripts + "/system/html/entityProperties.html"
                 enabled: true
+                blurOnCtrlShift: false
             }
         }
     }
@@ -275,6 +277,7 @@ TabBar {
                 id: gridControlsWebView
                 url: Paths.defaultScripts + "/system/html/gridControls.html"
                 enabled: true
+                blurOnCtrlShift: false
             }
         }
     }
diff --git a/interface/resources/qml/hifi/tablet/EditToolsTabView.qml b/interface/resources/qml/hifi/tablet/EditToolsTabView.qml
index 2b78576526..6b64520feb 100644
--- a/interface/resources/qml/hifi/tablet/EditToolsTabView.qml
+++ b/interface/resources/qml/hifi/tablet/EditToolsTabView.qml
@@ -251,6 +251,7 @@ TabBar {
                 id: entityPropertiesWebView
                 url: Paths.defaultScripts + "/system/html/entityProperties.html"
                 enabled: true
+                blurOnCtrlShift: false
             }
         }
     }
@@ -266,6 +267,7 @@ TabBar {
                 id: gridControlsWebView
                 url: Paths.defaultScripts + "/system/html/gridControls.html"
                 enabled: true
+                blurOnCtrlShift: false
             }
         }
     }
diff --git a/interface/resources/qml/hifi/tablet/EntityList.qml b/interface/resources/qml/hifi/tablet/EntityList.qml
index f4b47c19bb..2f8a8863be 100644
--- a/interface/resources/qml/hifi/tablet/EntityList.qml
+++ b/interface/resources/qml/hifi/tablet/EntityList.qml
@@ -2,4 +2,5 @@ WebView {
     id: entityListToolWebView
     url: Paths.defaultScripts + "/system/html/entityList.html"
     enabled: true
+    blurOnCtrlShift: false
 }
diff --git a/scripts/system/libraries/EditEntityList.qml b/scripts/system/libraries/EditEntityList.qml
index d8099cb670..4fc5ff19ef 100644
--- a/scripts/system/libraries/EditEntityList.qml
+++ b/scripts/system/libraries/EditEntityList.qml
@@ -8,4 +8,5 @@ HifiControls.WebView {
     id: entityListToolWebView
     url: Qt.resolvedUrl("../html/entityList.html")
     enabled: true
+    blurOnCtrlShift: false
 }