From 1d095b8158afa9f8bdd13c06b5a2f79c92b45879 Mon Sep 17 00:00:00 2001 From: Faye Li Date: Mon, 20 Mar 2017 15:57:59 -0700 Subject: [PATCH] added back forward and back button on nav bar --- .../qml/hifi/tablet/TabletAddressDialog.qml | 54 ++++++++++++------- 1 file changed, 35 insertions(+), 19 deletions(-) diff --git a/interface/resources/qml/hifi/tablet/TabletAddressDialog.qml b/interface/resources/qml/hifi/tablet/TabletAddressDialog.qml index 3a6577f4c0..d2af9a6999 100644 --- a/interface/resources/qml/hifi/tablet/TabletAddressDialog.qml +++ b/interface/resources/qml/hifi/tablet/TabletAddressDialog.qml @@ -87,26 +87,12 @@ Item { width: 480 height: 70 - gradient: Gradient { - GradientStop { - position: 0 - color: "#c2ced8" - - } - - GradientStop { - position: 1 - color: "#c2ced8" - } - } - anchors { top: parent.top right: parent.right left: parent.left } - ToolbarButton { id: homeButton imageURL: "../../../images/home.svg" @@ -120,10 +106,40 @@ Item { verticalCenter: parent.verticalCenter } } + ToolbarButton { + id: backArrow; + imageURL: "../../../images/backward.svg"; + onClicked: addressBarDialog.loadBack(); + anchors { + left: homeButton.right + verticalCenter: parent.verticalCenter + } + } + ToolbarButton { + id: forwardArrow; + imageURL: "../../../images/forward.svg"; + onClicked: addressBarDialog.loadForward(); + anchors { + left: backArrow.right + verticalCenter: parent.verticalCenter + } + } + } + + Rectangle { + id: addressBar + width: 480 + height: 70 + anchors { + top: navBar.bottom + right: parent.right + left: parent.left + } + property int inputAreaHeight: 70 property int inputAreaStep: (height - inputAreaHeight) / 2 - HifiStyles.RalewayLight { + HifiStyles.RalewayLight { id: notice; font.pixelSize: hifi.fonts.pixelSize * 0.50; anchors { @@ -147,10 +163,10 @@ Item { focus: true anchors { bottom: parent.bottom - left: homeButton.right + left: parent.left right: parent.right - leftMargin: homeButton.width - rightMargin: homeButton.width / 2 + leftMargin: 0 + rightMargin: 0 topMargin: parent.inputAreaStep + (2 * hifi.layout.spacing) bottomMargin: parent.inputAreaStep } @@ -204,7 +220,7 @@ Item { anchors.left: parent.left anchors.leftMargin: 0 anchors.topMargin: 0 - anchors.top: navBar.bottom + anchors.top: addressBar.bottom Row { id: thing