Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 17:14:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 21070

Browse source 
Conflicts:
	interface/resources/qml/AddressBarDialog.qml
This commit is contained in:
David Rowe 2016-10-16 14:09:53 +13:00
commit a767a27e7e
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,12 +23,12 @@ Window {
HifiConstants { id: hifi }
objectName: "AddressBarDialog"
frame: HiddenFrame {}
hideBackground: true
title: "Go To"
shown: false
destroyOnHidden: false
resizable: false
pinnable: false;
scale: 1.25 // Make this dialog a little larger than normal
width: addressBarDialog.implicitWidth
@ -78,7 +78,8 @@ Window {
property bool punctuationMode: false
implicitWidth: backgroundImage.width
implicitHeight: backgroundImage.height + ((keyboardEnabled && keyboardRaised) ? keyboard.raisedHeight : 0)
implicitHeight: backgroundImage.height + (keyboardEnabled ? keyboard.raisedHeight + 2 * hifi.layout.spacing : 0)
+ cardHeight - 36 // Fudge to reduce bottom margin.
// 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;
@ -97,8 +98,7 @@ Window {
spacing: hifi.layout.spacing;
clip: true;
anchors {
bottom: backgroundImage.top;
bottomMargin: 2 * hifi.layout.spacing;
top: parent.top
horizontalCenter: backgroundImage.horizontalCenter
}
model: suggestions;
@ -138,6 +138,10 @@ Window {
source: "../images/address-bar.svg"
width: 576 * root.scale
height: 80 * root.scale
anchors {
top: scroll.bottom
}
property int inputAreaHeight: 56.0 * root.scale // Height of the background's input area
property int inputAreaStep: (height - inputAreaHeight) / 2
@ -282,12 +286,12 @@ Window {
HifiControls.Keyboard {
id: keyboard
raised: parent.keyboardEnabled && parent.keyboardRaised
raised: parent.keyboardEnabled // Ignore keyboardRaised; keep keyboard raised if enabled (i.e., in HMD).
numeric: parent.punctuationMode
anchors {
top: backgroundImage.bottom
left: parent.left
right: parent.right
bottom: parent.bottom
}
}
}