diff --git a/interface/resources/images/arrowcontainer.svg b/interface/resources/images/arrowcontainer.svg
new file mode 100644
index 0000000000..7f8bd28944
--- /dev/null
+++ b/interface/resources/images/arrowcontainer.svg
@@ -0,0 +1,3 @@
+
+
+
diff --git a/interface/resources/images/darkgreyarrow.svg b/interface/resources/images/darkgreyarrow.svg
new file mode 100644
index 0000000000..6feb2be586
--- /dev/null
+++ b/interface/resources/images/darkgreyarrow.svg
@@ -0,0 +1,3 @@
+
+
+
diff --git a/interface/resources/images/lightgreyarrow.svg b/interface/resources/images/lightgreyarrow.svg
new file mode 100644
index 0000000000..defaf8d798
--- /dev/null
+++ b/interface/resources/images/lightgreyarrow.svg
@@ -0,0 +1,3 @@
+
+
+
diff --git a/interface/resources/images/sepline.svg b/interface/resources/images/sepline.svg
new file mode 100644
index 0000000000..32afaf7148
--- /dev/null
+++ b/interface/resources/images/sepline.svg
@@ -0,0 +1,3 @@
+
+
+
diff --git a/interface/resources/qml/AddressBarDialog.qml b/interface/resources/qml/AddressBarDialog.qml
index 3377b20d87..5cac0da223 100644
--- a/interface/resources/qml/AddressBarDialog.qml
+++ b/interface/resources/qml/AddressBarDialog.qml
@@ -45,19 +45,47 @@ DialogContainer {
property int inputAreaHeight: 56.0 * root.scale // Height of the background's input area
property int inputAreaStep: (height - inputAreaHeight) / 2
+ Image {
+ id: arrowContainer
+
+ source: "../images/arrowcontainer.svg"
+
+ anchors {
+ fill: parent
+ leftMargin: parent.height + hifi.layout.spacing * 2
+ rightMargin: parent.height + hifi.layout.spacing * 50
+ topMargin: parent.inputAreaStep + hifi.layout.spacing
+ bottomMargin: parent.inputAreaStep + hifi.layout.spacing
+ }
+ }
+
+ //Image {
+ // id: darkGreyArrowBack
+
+ // source: "../images/darkgreyarrow.svg"
+
+ //anchors {
+ // fill: parent
+ // leftMargin: parent.height + hifi.layout.spacing * 4
+ // rightMargin: parent.height + hifi.layout.spacing * 55
+ // topMargin: parent.inputAreaStep + parent.inputAreaStep + hifi.layout.spacing
+ // bottomMargin: parent.inputAreaStep + parent.inputAreaStep + hifi.layout.spacing
+ //}
+ //}
+
TextInput {
id: addressLine
anchors {
fill: parent
- leftMargin: parent.height + hifi.layout.spacing * 2
+ leftMargin: parent.height + parent.height + hifi.layout.spacing * 5
rightMargin: hifi.layout.spacing * 2
topMargin: parent.inputAreaStep + hifi.layout.spacing
bottomMargin: parent.inputAreaStep + hifi.layout.spacing
}
- font.pixelSize: hifi.fonts.pixelSize * root.scale
+ font.pixelSize: hifi.fonts.pixelSize * root.scale * 0.75
helperText: "Go to: place, @user, /path, network address"
diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
index 9ef32b411e..57bc0ec60e 100644
--- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp
+++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
@@ -48,6 +48,9 @@
#include "RenderablePolyVoxEntityItem.h"
#include "EntitiesRendererLogging.h"
+#include "DependencyManager.h"
+#include "AddressManager.h"
+
EntityTreeRenderer::EntityTreeRenderer(bool wantScripts, AbstractViewStateInterface* viewState,
AbstractScriptingServicesInterface* scriptingServices) :
OctreeRenderer(),
@@ -921,7 +924,7 @@ void EntityTreeRenderer::mouseMoveEvent(QMouseEvent* event, unsigned int deviceI
QString urlString = rayPickResult.properties.getHref();
QUrl url = QUrl(urlString, QUrl::StrictMode);
- if (url.isValid() && !url.isEmpty()){
+ if (url.isValid() && !url.isEmpty()) {
qCDebug(entitiesrenderer) << "mouseMoveEvent over entity:" << urlString;
} else {
qCDebug(entitiesrenderer) << "mouseMoveEvent over entity:" << "Not valid href";