From 225e2ebfdc8003be22124f221f26bdce927c6738 Mon Sep 17 00:00:00 2001 From: Niraj Venkat Date: Wed, 17 Jun 2015 14:27:16 -0700 Subject: [PATCH] Fixing build issues and finishing up address bar --- interface/resources/qml/AddressBarDialog.qml | 11 +++++------ interface/src/ui/AddressBarDialog.cpp | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/interface/resources/qml/AddressBarDialog.qml b/interface/resources/qml/AddressBarDialog.qml index b8543c132d..70cb22dc4d 100644 --- a/interface/resources/qml/AddressBarDialog.qml +++ b/interface/resources/qml/AddressBarDialog.qml @@ -62,8 +62,7 @@ DialogContainer { MouseArea { anchors.fill: parent acceptedButtons: Qt.LeftButton - onClicked: { - event.accepted = true + onClicked: { addressBarDialog.loadBack() } } @@ -85,8 +84,7 @@ DialogContainer { MouseArea { anchors.fill: parent acceptedButtons: Qt.LeftButton - onClicked: { - event.accepted = true + onClicked: { addressBarDialog.loadForward() } } @@ -113,7 +111,7 @@ DialogContainer { addressBarDialog.loadAddress(addressLine.text) } } - + MouseArea { // Drag the icon width: parent.height @@ -129,6 +127,7 @@ DialogContainer { } } + /* MouseArea { // Drag the input rectangle width: parent.width - parent.height @@ -142,7 +141,7 @@ DialogContainer { maximumX: root.parent ? root.maximumX : 0 maximumY: root.parent ? root.maximumY + parent.inputAreaStep : 0 } - } + }*/ } } diff --git a/interface/src/ui/AddressBarDialog.cpp b/interface/src/ui/AddressBarDialog.cpp index 50fbf979a0..80f51ff906 100644 --- a/interface/src/ui/AddressBarDialog.cpp +++ b/interface/src/ui/AddressBarDialog.cpp @@ -31,7 +31,7 @@ void AddressBarDialog::hide() { void AddressBarDialog::loadAddress(const QString& address) { qDebug() << "Called LoadAddress with address " << address; if (!address.isEmpty()) { - DependencyManager::get()->handleLookupString(address);; + DependencyManager::get()->handleLookupString(address); } }