Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 16:36:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #8817 from howard-stearns/goto-close

Browse source 
Goto close
This commit is contained in:
Seth Alves 2016-10-15 08:00:43 -07:00 committed by GitHub
commit 72d3a594b2
1 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
interface/resources/qml/AddressBarDialog.qml
View file

@ -23,12 +23,12 @@ Window {
HifiConstants { id: hifi } HifiConstants { id: hifi }
objectName: "AddressBarDialog" objectName: "AddressBarDialog"
frame: HiddenFrame {} title: "Go To"
hideBackground: true
shown: false shown: false
destroyOnHidden: false destroyOnHidden: false
resizable: false resizable: false
pinnable: false;
scale: 1.25 // Make this dialog a little larger than normal scale: 1.25 // Make this dialog a little larger than normal
width: addressBarDialog.implicitWidth width: addressBarDialog.implicitWidth
@ -62,6 +62,7 @@ Window {
clearAddressLineTimer.start(); clearAddressLineTimer.start();
} }
property var allStories: []; property var allStories: [];
property int keyboardHeight: 200;
property int cardWidth: 200; property int cardWidth: 200;
property int cardHeight: 152; property int cardHeight: 152;
property string metaverseBase: addressBarDialog.metaverseServerUrl + "/api/v1/"; property string metaverseBase: addressBarDialog.metaverseServerUrl + "/api/v1/";
@ -70,11 +71,10 @@ Window {
AddressBarDialog { AddressBarDialog {
id: addressBarDialog id: addressBarDialog
property bool keyboardRaised: false
property bool punctuationMode: false property bool punctuationMode: false
implicitWidth: backgroundImage.width implicitWidth: backgroundImage.width
implicitHeight: backgroundImage.height + (keyboardRaised ? 200 : 0) implicitHeight: backgroundImage.height + keyboardHeight + cardHeight - 25; // fudge to make header reasonable
// The buttons have their button state changed on hover, so we have to manually fix them up here // 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; onBackEnabledChanged: backArrow.buttonState = addressBarDialog.backEnabled ? 1 : 0;
@ -94,7 +94,6 @@ Window {
clip: true; clip: true;
anchors { anchors {
bottom: backgroundImage.top; bottom: backgroundImage.top;
bottomMargin: 2 * hifi.layout.spacing;
horizontalCenter: backgroundImage.horizontalCenter horizontalCenter: backgroundImage.horizontalCenter
} }
model: suggestions; model: suggestions;
@ -134,6 +133,10 @@ Window {
source: "../images/address-bar.svg" source: "../images/address-bar.svg"
width: 576 * root.scale width: 576 * root.scale
height: 80 * root.scale height: 80 * root.scale
anchors {
verticalCenter: parent.verticalCenter;
verticalCenterOffset: -15; // fudge to keep header reasonable and keep us under Card
}
property int inputAreaHeight: 56.0 * root.scale // Height of the background's input area property int inputAreaHeight: 56.0 * root.scale // Height of the background's input area
property int inputAreaStep: (height - inputAreaHeight) / 2 property int inputAreaStep: (height - inputAreaHeight) / 2
@ -279,29 +282,29 @@ Window {
// virtual keyboard, letters // virtual keyboard, letters
HifiControls.Keyboard { HifiControls.Keyboard {
id: keyboard1 id: keyboard1
y: parent.keyboardRaised ? parent.height : 0 y: parent.height
height: parent.keyboardRaised ? 200 : 0 height: keyboardHeight
visible: parent.keyboardRaised && !parent.punctuationMode visible: !parent.punctuationMode
enabled: parent.keyboardRaised && !parent.punctuationMode enabled: !parent.punctuationMode
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 0 anchors.rightMargin: 0
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: 0 anchors.leftMargin: 0
anchors.bottom: parent.bottom anchors.top: backgroundImage.bottom
anchors.bottomMargin: 0 anchors.bottomMargin: 0
} }
HifiControls.KeyboardPunctuation { HifiControls.KeyboardPunctuation {
id: keyboard2 id: keyboard2
y: parent.keyboardRaised ? parent.height : 0 y: parent.height
height: parent.keyboardRaised ? 200 : 0 height: keyboardHeight
visible: parent.keyboardRaised && parent.punctuationMode visible: parent.punctuationMode
enabled: parent.keyboardRaised && parent.punctuationMode enabled: parent.punctuationMode
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 0 anchors.rightMargin: 0
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: 0 anchors.leftMargin: 0
anchors.bottom: parent.bottom anchors.top: backgroundImage.bottom
anchors.bottomMargin: 0 anchors.bottomMargin: 0
} }
} }