From 41c7f714e20e66aaff4cbc41d7efc1dead2ef9b7 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Wed, 2 Nov 2016 16:49:45 +1300 Subject: [PATCH] Add keyboard control to marketplaces window --- interface/resources/qml/Marketplaces.qml | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/interface/resources/qml/Marketplaces.qml b/interface/resources/qml/Marketplaces.qml index 167a456e06..f05f7e11a0 100644 --- a/interface/resources/qml/Marketplaces.qml +++ b/interface/resources/qml/Marketplaces.qml @@ -33,12 +33,20 @@ Rectangle { property string claraMessage: "Choose a model and click Download -> Autodesk FBX." property string claraError: "High Fidelity only supports Autodesk FBX models." + property bool keyboardEnabled: true + property bool keyboardRaised: true + property bool punctuationMode: false + + onVisibleChanged: { + keyboardEnabled = HMD.active; + } + Controls.BaseWebView { id: webview url: marketplacesUrl anchors.top: marketplace.top width: parent.width - height: parent.height - statusBarHeight + height: parent.height - statusBarHeight - keyboard.height focus: true Timer { @@ -136,7 +144,7 @@ Rectangle { Rectangle { id: statusBar anchors.top: webview.bottom - anchors.bottom: parent.bottom + anchors.bottom: keyboard.top anchors.left: parent.left anchors.right: parent.right color: hifi.colors.blueHighlight @@ -172,6 +180,17 @@ Rectangle { color: hifi.colors.white size: hifi.fontSizes.tableHeadingIcon } + } + Controls.Keyboard { + id: keyboard + enabled: keyboardEnabled + raised: keyboardEnabled && keyboardRaised + numeric: punctuationMode + anchors { + left: parent.left + right: parent.right + bottom: parent.bottom + } } }