From 1be303e3ed8cd2f812aa7e8fe37652321652508d Mon Sep 17 00:00:00 2001 From: Niraj Venkat Date: Thu, 18 Jun 2015 15:07:27 -0700 Subject: [PATCH 1/8] Address bar polish --- interface/resources/images/redarrow.svg | 11 +++++++++ interface/resources/qml/AddressBarDialog.qml | 21 +++++++++++++++- interface/src/ui/AddressBarDialog.cpp | 26 ++++++++++++++++++++ interface/src/ui/AddressBarDialog.h | 2 ++ 4 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 interface/resources/images/redarrow.svg diff --git a/interface/resources/images/redarrow.svg b/interface/resources/images/redarrow.svg new file mode 100644 index 0000000000..156f4baa45 --- /dev/null +++ b/interface/resources/images/redarrow.svg @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/interface/resources/qml/AddressBarDialog.qml b/interface/resources/qml/AddressBarDialog.qml index 70cb22dc4d..8a73116f8a 100644 --- a/interface/resources/qml/AddressBarDialog.qml +++ b/interface/resources/qml/AddressBarDialog.qml @@ -30,6 +30,12 @@ DialogContainer { property int maximumX: parent ? parent.width - width : 0 property int maximumY: parent ? parent.height - height : 0 + + function myQmlFunction(msg) { + console.log("Got message:", msg) + return "some return value" + } + AddressBarDialog { id: addressBarDialog @@ -49,7 +55,6 @@ DialogContainer { id: backArrow source: "../images/left-arrow.svg" - scale: 0.9 anchors { fill: parent @@ -66,6 +71,13 @@ DialogContainer { addressBarDialog.loadBack() } } + + Connections { + target: addressBarDialog + onGoBackPossible: { + console.log("ayy lmao BACK") + } + } } Image { @@ -88,6 +100,13 @@ DialogContainer { addressBarDialog.loadForward() } } + + Connections { + target: addressBarDialog + onGoForwardPossible: { + console.log("ayy lmao FORWARD") + } + } } TextInput { diff --git a/interface/src/ui/AddressBarDialog.cpp b/interface/src/ui/AddressBarDialog.cpp index 80f51ff906..739f008c21 100644 --- a/interface/src/ui/AddressBarDialog.cpp +++ b/interface/src/ui/AddressBarDialog.cpp @@ -22,12 +22,38 @@ AddressBarDialog::AddressBarDialog(QQuickItem* parent) : OffscreenQmlDialog(pare connect(addressManager.data(), &AddressManager::lookupResultIsOffline, this, &AddressBarDialog::displayAddressOfflineMessage); connect(addressManager.data(), &AddressManager::lookupResultIsNotFound, this, &AddressBarDialog::displayAddressNotFoundMessage); connect(addressManager.data(), &AddressManager::lookupResultsFinished, this, &AddressBarDialog::hide); + connect(addressManager.data(), &AddressManager::goBackPossible, this, &AddressBarDialog::changeBackAlpha); + connect(addressManager.data(), &AddressManager::goForwardPossible, this, &AddressBarDialog::changeForwardAlpha); } void AddressBarDialog::hide() { ((QQuickItem*)parent())->setEnabled(false); } +void AddressBarDialog::changeBackAlpha(bool isPossible) { + if (isPossible) qDebug() << "Back is possible"; + else qDebug() << "Back is not possible"; +} + +void AddressBarDialog::changeForwardAlpha(bool isPossible) { + if (isPossible) qDebug() << "Forward is possible"; + else qDebug() << "Forward is not possible"; + + QQmlEngine engine; + QQmlComponent component(&engine, "AddressBarDialog.qml"); + QObject *object = component.create(); + qDebug() << "AAAAAAAAAAAAAA : " << ((QQuickItem*)parent())->children()[0]->objectName(); + + QVariant returnedValue; + QVariant msg = "Hello from C++"; + QMetaObject::invokeMethod(object, "myQmlFunction", + Q_RETURN_ARG(QVariant, returnedValue), + Q_ARG(QVariant, msg)); + + qDebug() << "QML function returned:" << returnedValue.toString(); + delete object;; +} + void AddressBarDialog::loadAddress(const QString& address) { qDebug() << "Called LoadAddress with address " << address; if (!address.isEmpty()) { diff --git a/interface/src/ui/AddressBarDialog.h b/interface/src/ui/AddressBarDialog.h index da54e29929..d3548d4bd7 100644 --- a/interface/src/ui/AddressBarDialog.h +++ b/interface/src/ui/AddressBarDialog.h @@ -26,6 +26,8 @@ protected: void displayAddressOfflineMessage(); void displayAddressNotFoundMessage(); void hide(); + void changeBackAlpha(bool isPossible); + void changeForwardAlpha(bool isPossible); Q_INVOKABLE void loadAddress(const QString& address); Q_INVOKABLE void loadBack(); From 564549117031124cc13a0cceb6fe71f86cb164f2 Mon Sep 17 00:00:00 2001 From: Niraj Venkat Date: Thu, 18 Jun 2015 15:09:13 -0700 Subject: [PATCH 2/8] Further changes to address bar --- interface/resources/qml/AddressBarDialog.qml | 4 ++-- interface/src/ui/AddressBarDialog.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/resources/qml/AddressBarDialog.qml b/interface/resources/qml/AddressBarDialog.qml index 8a73116f8a..23dc34b784 100644 --- a/interface/resources/qml/AddressBarDialog.qml +++ b/interface/resources/qml/AddressBarDialog.qml @@ -75,7 +75,7 @@ DialogContainer { Connections { target: addressBarDialog onGoBackPossible: { - console.log("ayy lmao BACK") + console.log("BACK") } } } @@ -104,7 +104,7 @@ DialogContainer { Connections { target: addressBarDialog onGoForwardPossible: { - console.log("ayy lmao FORWARD") + console.log("FORWARD") } } } diff --git a/interface/src/ui/AddressBarDialog.cpp b/interface/src/ui/AddressBarDialog.cpp index 739f008c21..49b5126b99 100644 --- a/interface/src/ui/AddressBarDialog.cpp +++ b/interface/src/ui/AddressBarDialog.cpp @@ -42,7 +42,7 @@ void AddressBarDialog::changeForwardAlpha(bool isPossible) { QQmlEngine engine; QQmlComponent component(&engine, "AddressBarDialog.qml"); QObject *object = component.create(); - qDebug() << "AAAAAAAAAAAAAA : " << ((QQuickItem*)parent())->children()[0]->objectName(); + qDebug() << "Current parent's child : " << ((QQuickItem*)parent())->children()[0]->objectName(); QVariant returnedValue; QVariant msg = "Hello from C++"; From 894a24531834e875acb63e000ccb061d13777897 Mon Sep 17 00:00:00 2001 From: Niraj Venkat Date: Thu, 18 Jun 2015 17:35:50 -0700 Subject: [PATCH 3/8] Further changes to address bar --- interface/resources/qml/AddressBarDialog.qml | 32 +++++++++++--------- interface/src/ui/AddressBarDialog.cpp | 26 ++++++++-------- interface/src/ui/AddressBarDialog.h | 9 ++++++ 3 files changed, 38 insertions(+), 29 deletions(-) diff --git a/interface/resources/qml/AddressBarDialog.qml b/interface/resources/qml/AddressBarDialog.qml index 23dc34b784..105868d8f4 100644 --- a/interface/resources/qml/AddressBarDialog.qml +++ b/interface/resources/qml/AddressBarDialog.qml @@ -31,11 +31,6 @@ DialogContainer { property int maximumY: parent ? parent.height - height : 0 - function myQmlFunction(msg) { - console.log("Got message:", msg) - return "some return value" - } - AddressBarDialog { id: addressBarDialog @@ -54,7 +49,7 @@ DialogContainer { Image { id: backArrow - source: "../images/left-arrow.svg" + source: addressBarDialog.backEnabled ? "../images/left-arrow.svg" : "../images/redarrow.svg" anchors { fill: parent @@ -72,18 +67,22 @@ DialogContainer { } } + //onBackEnabledChanged: { parent.source: "../images/redarrow.svg" } + + /* Connections { - target: addressBarDialog - onGoBackPossible: { - console.log("BACK") + target: backArrow + onBackState: { + parent.source: "../images/redarrow.svg" + } - } + }*/ } Image { id: forwardArrow - source: "../images/darkgreyarrow.svg" + source: addressBarDialog.forwardEnabled ? "../images/darkgreyarrow.svg" : "../images/redarrow.svg" anchors { fill: parent @@ -101,12 +100,15 @@ DialogContainer { } } + //onForwardEnabledChanged: { parent.source: "../images/redarrow.svg" } + + /* Connections { - target: addressBarDialog - onGoForwardPossible: { - console.log("FORWARD") + target: forwardArrow + onForwardState: { + parent.source: "../images/redarrow.svg" } - } + }*/ } TextInput { diff --git a/interface/src/ui/AddressBarDialog.cpp b/interface/src/ui/AddressBarDialog.cpp index 49b5126b99..70a2fa165f 100644 --- a/interface/src/ui/AddressBarDialog.cpp +++ b/interface/src/ui/AddressBarDialog.cpp @@ -16,6 +16,8 @@ #include "AddressManager.h" HIFI_QML_DEF(AddressBarDialog) +Q_PROPERTY(bool backEnabled READ backEnabled CHANGED backEnabledChanged) +Q_PROPERTY(bool forwardEnabled READ forwardEnabled CHANGED forwardEnabledChanged) AddressBarDialog::AddressBarDialog(QQuickItem* parent) : OffscreenQmlDialog(parent) { auto addressManager = DependencyManager::get(); @@ -24,6 +26,8 @@ AddressBarDialog::AddressBarDialog(QQuickItem* parent) : OffscreenQmlDialog(pare connect(addressManager.data(), &AddressManager::lookupResultsFinished, this, &AddressBarDialog::hide); connect(addressManager.data(), &AddressManager::goBackPossible, this, &AddressBarDialog::changeBackAlpha); connect(addressManager.data(), &AddressManager::goForwardPossible, this, &AddressBarDialog::changeForwardAlpha); + _backEnabled = false; + _forwardEnabled = false; } void AddressBarDialog::hide() { @@ -33,25 +37,19 @@ void AddressBarDialog::hide() { void AddressBarDialog::changeBackAlpha(bool isPossible) { if (isPossible) qDebug() << "Back is possible"; else qDebug() << "Back is not possible"; + if (isPossible != _backEnabled) { + _backEnabled = isPossible; + emit backEnabledChanged(); + } } void AddressBarDialog::changeForwardAlpha(bool isPossible) { if (isPossible) qDebug() << "Forward is possible"; else qDebug() << "Forward is not possible"; - - QQmlEngine engine; - QQmlComponent component(&engine, "AddressBarDialog.qml"); - QObject *object = component.create(); - qDebug() << "Current parent's child : " << ((QQuickItem*)parent())->children()[0]->objectName(); - - QVariant returnedValue; - QVariant msg = "Hello from C++"; - QMetaObject::invokeMethod(object, "myQmlFunction", - Q_RETURN_ARG(QVariant, returnedValue), - Q_ARG(QVariant, msg)); - - qDebug() << "QML function returned:" << returnedValue.toString(); - delete object;; + if (isPossible != _forwardEnabled) { + _forwardEnabled = isPossible; + emit forwardEnabledChanged(); + } } void AddressBarDialog::loadAddress(const QString& address) { diff --git a/interface/src/ui/AddressBarDialog.h b/interface/src/ui/AddressBarDialog.h index d3548d4bd7..e822deb243 100644 --- a/interface/src/ui/AddressBarDialog.h +++ b/interface/src/ui/AddressBarDialog.h @@ -21,6 +21,12 @@ class AddressBarDialog : public OffscreenQmlDialog public: AddressBarDialog(QQuickItem* parent = nullptr); + bool backEnabled() { return _backEnabled; } + bool forwardEnabled() { return _forwardEnabled; } + +signals: + void backEnabledChanged(); + void forwardEnabledChanged(); protected: void displayAddressOfflineMessage(); @@ -32,6 +38,9 @@ protected: Q_INVOKABLE void loadAddress(const QString& address); Q_INVOKABLE void loadBack(); Q_INVOKABLE void loadForward(); + + bool _backEnabled; + bool _forwardEnabled; }; #endif From afc2db6c6a77a874df4f681faaf724861d90988d Mon Sep 17 00:00:00 2001 From: Niraj Venkat Date: Thu, 18 Jun 2015 18:25:48 -0700 Subject: [PATCH 4/8] address bar commit --- interface/resources/qml/AddressBarDialog.qml | 4 ++++ interface/src/ui/AddressBarDialog.cpp | 2 -- interface/src/ui/AddressBarDialog.h | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/interface/resources/qml/AddressBarDialog.qml b/interface/resources/qml/AddressBarDialog.qml index 105868d8f4..13b29c0555 100644 --- a/interface/resources/qml/AddressBarDialog.qml +++ b/interface/resources/qml/AddressBarDialog.qml @@ -37,6 +37,10 @@ DialogContainer { implicitWidth: backgroundImage.width implicitHeight: backgroundImage.height + onParentChanged: { + console.log("Test: " + addressBarDialog.backEnabled + " " + addressBarDialog.forwardEnabled+ " " + addressBarDialog) + } + Image { id: backgroundImage diff --git a/interface/src/ui/AddressBarDialog.cpp b/interface/src/ui/AddressBarDialog.cpp index 70a2fa165f..e9d1251772 100644 --- a/interface/src/ui/AddressBarDialog.cpp +++ b/interface/src/ui/AddressBarDialog.cpp @@ -16,8 +16,6 @@ #include "AddressManager.h" HIFI_QML_DEF(AddressBarDialog) -Q_PROPERTY(bool backEnabled READ backEnabled CHANGED backEnabledChanged) -Q_PROPERTY(bool forwardEnabled READ forwardEnabled CHANGED forwardEnabledChanged) AddressBarDialog::AddressBarDialog(QQuickItem* parent) : OffscreenQmlDialog(parent) { auto addressManager = DependencyManager::get(); diff --git a/interface/src/ui/AddressBarDialog.h b/interface/src/ui/AddressBarDialog.h index e822deb243..5cfdde1459 100644 --- a/interface/src/ui/AddressBarDialog.h +++ b/interface/src/ui/AddressBarDialog.h @@ -18,6 +18,8 @@ class AddressBarDialog : public OffscreenQmlDialog { Q_OBJECT HIFI_QML_DECL + Q_PROPERTY(bool backEnabled READ backEnabled CHANGED backEnabledChanged) + Q_PROPERTY(bool forwardEnabled READ forwardEnabled CHANGED forwardEnabledChanged) public: AddressBarDialog(QQuickItem* parent = nullptr); From b15e7cec216a537b2c7eab6c4fa28bf1bb3e3d1a Mon Sep 17 00:00:00 2001 From: Niraj Venkat Date: Fri, 19 Jun 2015 11:17:56 -0700 Subject: [PATCH 5/8] Back and forward are red if not possible --- interface/resources/qml/AddressBarDialog.qml | 8 ++------ interface/src/ui/AddressBarDialog.cpp | 4 ++-- interface/src/ui/AddressBarDialog.h | 4 ++-- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/interface/resources/qml/AddressBarDialog.qml b/interface/resources/qml/AddressBarDialog.qml index 13b29c0555..6caed7b029 100644 --- a/interface/resources/qml/AddressBarDialog.qml +++ b/interface/resources/qml/AddressBarDialog.qml @@ -38,7 +38,7 @@ DialogContainer { implicitHeight: backgroundImage.height onParentChanged: { - console.log("Test: " + addressBarDialog.backEnabled + " " + addressBarDialog.forwardEnabled+ " " + addressBarDialog) + console.log("Test: " + addressBarDialog.backEnabled + " " + addressBarDialog.forwardEnabled + " " + addressBarDialog) } Image { @@ -53,7 +53,7 @@ DialogContainer { Image { id: backArrow - source: addressBarDialog.backEnabled ? "../images/left-arrow.svg" : "../images/redarrow.svg" + source: addressBarDialog.backEnabled ? "../images/left-arrow.svg" : "../images/redarrow_reversed.svg" anchors { fill: parent @@ -71,8 +71,6 @@ DialogContainer { } } - //onBackEnabledChanged: { parent.source: "../images/redarrow.svg" } - /* Connections { target: backArrow @@ -104,8 +102,6 @@ DialogContainer { } } - //onForwardEnabledChanged: { parent.source: "../images/redarrow.svg" } - /* Connections { target: forwardArrow diff --git a/interface/src/ui/AddressBarDialog.cpp b/interface/src/ui/AddressBarDialog.cpp index e9d1251772..0590a63390 100644 --- a/interface/src/ui/AddressBarDialog.cpp +++ b/interface/src/ui/AddressBarDialog.cpp @@ -24,8 +24,8 @@ AddressBarDialog::AddressBarDialog(QQuickItem* parent) : OffscreenQmlDialog(pare connect(addressManager.data(), &AddressManager::lookupResultsFinished, this, &AddressBarDialog::hide); connect(addressManager.data(), &AddressManager::goBackPossible, this, &AddressBarDialog::changeBackAlpha); connect(addressManager.data(), &AddressManager::goForwardPossible, this, &AddressBarDialog::changeForwardAlpha); - _backEnabled = false; - _forwardEnabled = false; + _backEnabled = DependencyManager::get()->getBackState(); + _forwardEnabled = DependencyManager::get()->getForwardState(); } void AddressBarDialog::hide() { diff --git a/interface/src/ui/AddressBarDialog.h b/interface/src/ui/AddressBarDialog.h index 5cfdde1459..3148f828fd 100644 --- a/interface/src/ui/AddressBarDialog.h +++ b/interface/src/ui/AddressBarDialog.h @@ -18,8 +18,8 @@ class AddressBarDialog : public OffscreenQmlDialog { Q_OBJECT HIFI_QML_DECL - Q_PROPERTY(bool backEnabled READ backEnabled CHANGED backEnabledChanged) - Q_PROPERTY(bool forwardEnabled READ forwardEnabled CHANGED forwardEnabledChanged) + Q_PROPERTY(bool backEnabled READ backEnabled NOTIFY backEnabledChanged) + Q_PROPERTY(bool forwardEnabled READ forwardEnabled NOTIFY forwardEnabledChanged) public: AddressBarDialog(QQuickItem* parent = nullptr); From 1494aa4faa5c9e30e1453bb0e209d90432c1bc22 Mon Sep 17 00:00:00 2001 From: Niraj Venkat Date: Fri, 19 Jun 2015 11:18:16 -0700 Subject: [PATCH 6/8] Adding new icon and getters --- interface/resources/images/redarrow_reversed.svg | 11 +++++++++++ libraries/networking/src/AddressManager.h | 3 +++ 2 files changed, 14 insertions(+) create mode 100644 interface/resources/images/redarrow_reversed.svg diff --git a/interface/resources/images/redarrow_reversed.svg b/interface/resources/images/redarrow_reversed.svg new file mode 100644 index 0000000000..99c72cadb0 --- /dev/null +++ b/interface/resources/images/redarrow_reversed.svg @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/libraries/networking/src/AddressManager.h b/libraries/networking/src/AddressManager.h index b4c34176a4..2e506ffed6 100644 --- a/libraries/networking/src/AddressManager.h +++ b/libraries/networking/src/AddressManager.h @@ -62,6 +62,9 @@ public: void loadSettings(const QString& lookupString = QString()); + bool getBackState() { return (!_backStack.isEmpty()); } + bool getForwardState() { return (!_forwardStack.isEmpty()); } + public slots: void handleLookupString(const QString& lookupString); From 03c10d15e6080ce0800b47a1380205a9ccc82842 Mon Sep 17 00:00:00 2001 From: Niraj Venkat Date: Fri, 19 Jun 2015 14:37:21 -0700 Subject: [PATCH 7/8] Adding lambdas and removing dead code --- interface/resources/qml/AddressBarDialog.qml | 22 +------------- interface/src/ui/AddressBarDialog.cpp | 32 ++++++++------------ interface/src/ui/AddressBarDialog.h | 2 -- 3 files changed, 13 insertions(+), 43 deletions(-) diff --git a/interface/resources/qml/AddressBarDialog.qml b/interface/resources/qml/AddressBarDialog.qml index 6caed7b029..7531ee3d69 100644 --- a/interface/resources/qml/AddressBarDialog.qml +++ b/interface/resources/qml/AddressBarDialog.qml @@ -37,10 +37,6 @@ DialogContainer { implicitWidth: backgroundImage.width implicitHeight: backgroundImage.height - onParentChanged: { - console.log("Test: " + addressBarDialog.backEnabled + " " + addressBarDialog.forwardEnabled + " " + addressBarDialog) - } - Image { id: backgroundImage @@ -70,15 +66,6 @@ DialogContainer { addressBarDialog.loadBack() } } - - /* - Connections { - target: backArrow - onBackState: { - parent.source: "../images/redarrow.svg" - - } - }*/ } Image { @@ -101,14 +88,6 @@ DialogContainer { addressBarDialog.loadForward() } } - - /* - Connections { - target: forwardArrow - onForwardState: { - parent.source: "../images/redarrow.svg" - } - }*/ } TextInput { @@ -148,6 +127,7 @@ DialogContainer { } } + // Add this code to make text bar draggable /* MouseArea { // Drag the input rectangle diff --git a/interface/src/ui/AddressBarDialog.cpp b/interface/src/ui/AddressBarDialog.cpp index 0590a63390..4d2094ac51 100644 --- a/interface/src/ui/AddressBarDialog.cpp +++ b/interface/src/ui/AddressBarDialog.cpp @@ -22,8 +22,18 @@ AddressBarDialog::AddressBarDialog(QQuickItem* parent) : OffscreenQmlDialog(pare connect(addressManager.data(), &AddressManager::lookupResultIsOffline, this, &AddressBarDialog::displayAddressOfflineMessage); connect(addressManager.data(), &AddressManager::lookupResultIsNotFound, this, &AddressBarDialog::displayAddressNotFoundMessage); connect(addressManager.data(), &AddressManager::lookupResultsFinished, this, &AddressBarDialog::hide); - connect(addressManager.data(), &AddressManager::goBackPossible, this, &AddressBarDialog::changeBackAlpha); - connect(addressManager.data(), &AddressManager::goForwardPossible, this, &AddressBarDialog::changeForwardAlpha); + connect(addressManager.data(), &AddressManager::goBackPossible, this, [this] (bool isPossible) { + if (isPossible != _backEnabled) { + _backEnabled = isPossible; + emit backEnabledChanged(); + } + }); + connect(addressManager.data(), &AddressManager::goForwardPossible, this, [this] (bool isPossible) { + if (isPossible != _forwardEnabled) { + _forwardEnabled = isPossible; + emit forwardEnabledChanged(); + } + }); _backEnabled = DependencyManager::get()->getBackState(); _forwardEnabled = DependencyManager::get()->getForwardState(); } @@ -32,24 +42,6 @@ void AddressBarDialog::hide() { ((QQuickItem*)parent())->setEnabled(false); } -void AddressBarDialog::changeBackAlpha(bool isPossible) { - if (isPossible) qDebug() << "Back is possible"; - else qDebug() << "Back is not possible"; - if (isPossible != _backEnabled) { - _backEnabled = isPossible; - emit backEnabledChanged(); - } -} - -void AddressBarDialog::changeForwardAlpha(bool isPossible) { - if (isPossible) qDebug() << "Forward is possible"; - else qDebug() << "Forward is not possible"; - if (isPossible != _forwardEnabled) { - _forwardEnabled = isPossible; - emit forwardEnabledChanged(); - } -} - void AddressBarDialog::loadAddress(const QString& address) { qDebug() << "Called LoadAddress with address " << address; if (!address.isEmpty()) { diff --git a/interface/src/ui/AddressBarDialog.h b/interface/src/ui/AddressBarDialog.h index 3148f828fd..e0be8aa3fb 100644 --- a/interface/src/ui/AddressBarDialog.h +++ b/interface/src/ui/AddressBarDialog.h @@ -34,8 +34,6 @@ protected: void displayAddressOfflineMessage(); void displayAddressNotFoundMessage(); void hide(); - void changeBackAlpha(bool isPossible); - void changeForwardAlpha(bool isPossible); Q_INVOKABLE void loadAddress(const QString& address); Q_INVOKABLE void loadBack(); From 482f12be8cf22c3a65be472cbbfe2629ca8cfab0 Mon Sep 17 00:00:00 2001 From: Niraj Venkat Date: Fri, 19 Jun 2015 16:05:45 -0700 Subject: [PATCH 8/8] Returning ref to stack to view controller --- interface/src/ui/AddressBarDialog.cpp | 4 ++-- libraries/networking/src/AddressManager.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/src/ui/AddressBarDialog.cpp b/interface/src/ui/AddressBarDialog.cpp index 4d2094ac51..5d27af444a 100644 --- a/interface/src/ui/AddressBarDialog.cpp +++ b/interface/src/ui/AddressBarDialog.cpp @@ -34,8 +34,8 @@ AddressBarDialog::AddressBarDialog(QQuickItem* parent) : OffscreenQmlDialog(pare emit forwardEnabledChanged(); } }); - _backEnabled = DependencyManager::get()->getBackState(); - _forwardEnabled = DependencyManager::get()->getForwardState(); + _backEnabled = !(DependencyManager::get()->getBackStack().isEmpty()); + _forwardEnabled = !(DependencyManager::get()->getForwardStack().isEmpty()); } void AddressBarDialog::hide() { diff --git a/libraries/networking/src/AddressManager.h b/libraries/networking/src/AddressManager.h index 2e506ffed6..6d9ff01be2 100644 --- a/libraries/networking/src/AddressManager.h +++ b/libraries/networking/src/AddressManager.h @@ -62,8 +62,8 @@ public: void loadSettings(const QString& lookupString = QString()); - bool getBackState() { return (!_backStack.isEmpty()); } - bool getForwardState() { return (!_forwardStack.isEmpty()); } + const QStack& getBackStack() const { return _backStack; } + const QStack& getForwardStack() const { return _forwardStack; } public slots: void handleLookupString(const QString& lookupString);