From e5b56fec7c6b189937b03a17e826f1a9da7ffa4a Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Fri, 9 Sep 2016 11:32:17 -0700 Subject: [PATCH] put keyboard on location dialog --- interface/resources/qml/AddressBarDialog.qml | 38 ++++++++++++++++++-- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/interface/resources/qml/AddressBarDialog.qml b/interface/resources/qml/AddressBarDialog.qml index 2536fdade9..646c6bf2f0 100644 --- a/interface/resources/qml/AddressBarDialog.qml +++ b/interface/resources/qml/AddressBarDialog.qml @@ -18,6 +18,9 @@ import "hifi/toolbars" import "controls-uit" as HifiControls Window { + property bool keyboardRaised: true + property bool punctuationMode: false + id: root HifiConstants { id: hifi } @@ -68,7 +71,7 @@ Window { AddressBarDialog { id: addressBarDialog implicitWidth: backgroundImage.width - implicitHeight: backgroundImage.height + implicitHeight: backgroundImage.height + (keyboardRaised ? 200 : 0) // The buttons have their button state changed on hover, so we have to manually fix them up here onBackEnabledChanged: backArrow.buttonState = addressBarDialog.backEnabled ? 1 : 0; onForwardEnabledChanged: forwardArrow.buttonState = addressBarDialog.forwardEnabled ? 1 : 0; @@ -217,8 +220,8 @@ Window { } Window { - width: 938; - height: 625; + width: 938 + height: 625 scale: 0.8 // Reset scale of Window to 1.0 (counteract address bar's scale value of 1.25) HifiControls.WebView { anchors.fill: parent; @@ -235,6 +238,35 @@ Window { horizontalCenter: scroll.horizontalCenter; } } + + // virtual keyboard, letters + Keyboard { + id: keyboard1 + y: keyboardRaised ? parent.height : 0 + height: keyboardRaised ? 200 : 0 + visible: keyboardRaised && !punctuationMode + enabled: keyboardRaised && !punctuationMode + anchors.right: parent.right + anchors.rightMargin: 0 + anchors.left: parent.left + anchors.leftMargin: 0 + anchors.bottom: parent.bottom + anchors.bottomMargin: 0 + } + + KeyboardPunctuation { + id: keyboard2 + y: keyboardRaised ? parent.height : 0 + height: keyboardRaised ? 200 : 0 + visible: keyboardRaised && punctuationMode + enabled: keyboardRaised && punctuationMode + anchors.right: parent.right + anchors.rightMargin: 0 + anchors.left: parent.left + anchors.leftMargin: 0 + anchors.bottom: parent.bottom + anchors.bottomMargin: 0 + } }