Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-13 18:42:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Make ctrl+shift shortcuts work for create app

Browse source
This commit is contained in:
Thijs Wenker 2018-11-03 00:27:03 +01:00
parent e890228fc7
commit afd69d04dd
7 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/resources/qml/controls/FlickableWebViewCore.qml
View file

@ -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;
}
}
}

1
interface/resources/qml/controls/WebView.qml
View file

@ -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();

3
interface/resources/qml/hifi/tablet/EditEntityList.qml
View file

@ -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
}

3
interface/resources/qml/hifi/tablet/EditTabView.qml
View file

@ -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
}
}
}

2
interface/resources/qml/hifi/tablet/EditToolsTabView.qml
View file

@ -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
}
}
}

1
interface/resources/qml/hifi/tablet/EntityList.qml
View file

@ -2,4 +2,5 @@ WebView {
id: entityListToolWebView
url: Paths.defaultScripts + "/system/html/entityList.html"
enabled: true
blurOnCtrlShift: false
}

1
scripts/system/libraries/EditEntityList.qml
View file

@ -8,4 +8,5 @@ HifiControls.WebView {
id: entityListToolWebView
url: Qt.resolvedUrl("../html/entityList.html")
enabled: true
blurOnCtrlShift: false
}