Merge branch 'master' of https://github.com/highfidelity/hifi into refactor-playSound

examples/defaultScripts.js

@@ -16,7 +16,6 @@ Script.load("lobby.js");
 Script.load("notifications.js");
 Script.load("users.js");
 Script.load("grab.js");
-Script.load("pointer.js");
 Script.load("directory.js");
 Script.load("mouseLook.js");
 Script.load("dialTone.js");

interface/resources/images/redarrow.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns:xl="http://www.w3.org/1999/xlink"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="133.1 714.2 21.3 33.4"
+	 enable-background="new 133.1 714.2 21.3 33.4" xml:space="preserve">
+<g>
+	<g>
+		<path fill="#FF5353" d="M133.1,714.2l21.3,16.7l-21.3,16.7V714.2z"/>
+	</g>
+</g>
+</svg>

interface/resources/images/redarrow_reversed.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns:xl="http://www.w3.org/1999/xlink"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="225.8 714.2 326.5 512"
+	 enable-background="new 225.8 714.2 326.5 512" xml:space="preserve">
+<g>
+	<g>
+		<path fill="#FF5353" d="M552.4,1226.2l-326.5-256l326.5-256V1226.2z"/>
+	</g>
+</g>
+</svg>

interface/resources/qml/AddressBarDialog.qml

@@ -30,6 +30,7 @@ DialogContainer {
     property int maximumX: parent ? parent.width - width : 0
     property int maximumY: parent ? parent.height - height : 0
 
+
     AddressBarDialog {
         id: addressBarDialog
 
@@ -48,8 +49,7 @@ DialogContainer {
             Image {
                 id: backArrow
 
-                source: "../images/left-arrow.svg"
+                source: addressBarDialog.backEnabled ? "../images/left-arrow.svg" : "../images/redarrow_reversed.svg"
-                scale: 0.9
                 
                 anchors {
                     fill: parent
@@ -71,7 +71,7 @@ DialogContainer {
             Image {
                 id: forwardArrow
 
-                source: "../images/darkgreyarrow.svg"
+                source: addressBarDialog.forwardEnabled ? "../images/darkgreyarrow.svg" : "../images/redarrow.svg"
                 
                 anchors {
                     fill: parent
@@ -127,6 +127,7 @@ DialogContainer {
                 }
             }
 
+            // Add this code to make text bar draggable
             /*
             MouseArea {
                 // Drag the input rectangle

interface/src/Application.cpp

@@ -1602,6 +1602,8 @@ void Application::mouseDoublePressEvent(QMouseEvent* event, unsigned int deviceI
         return;
     }
 
+    _controllerScriptingInterface.emitMouseDoublePressEvent(event);
+    
     if (activeWindow() == _window) {
         if (event->button() == Qt::LeftButton) {
             if (mouseOnScreen()) {

interface/src/scripting/ControllerScriptingInterface.h

@@ -65,6 +65,7 @@ public:
 
     void emitMouseMoveEvent(QMouseEvent* event, unsigned int deviceID = 0) { emit mouseMoveEvent(MouseEvent(*event, deviceID)); }
     void emitMousePressEvent(QMouseEvent* event, unsigned int deviceID = 0) { emit mousePressEvent(MouseEvent(*event, deviceID)); }
+    void emitMouseDoublePressEvent(QMouseEvent* event, unsigned int deviceID = 0) { emit mouseDoublePressEvent(MouseEvent(*event, deviceID)); }
     void emitMouseReleaseEvent(QMouseEvent* event, unsigned int deviceID = 0) { emit mouseReleaseEvent(MouseEvent(*event, deviceID)); }
 
     void emitTouchBeginEvent(const TouchEvent& event) { emit touchBeginEvent(event); }

interface/src/ui/AddressBarDialog.cpp

@@ -22,6 +22,20 @@ 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, [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<AddressManager>()->getBackStack().isEmpty());
+    _forwardEnabled = !(DependencyManager::get<AddressManager>()->getForwardStack().isEmpty());
 }
 
 void AddressBarDialog::hide() {

interface/src/ui/AddressBarDialog.h

@@ -18,9 +18,17 @@ class AddressBarDialog : public OffscreenQmlDialog
 {
     Q_OBJECT
     HIFI_QML_DECL
+    Q_PROPERTY(bool backEnabled READ backEnabled NOTIFY backEnabledChanged)
+    Q_PROPERTY(bool forwardEnabled READ forwardEnabled NOTIFY forwardEnabledChanged)
 
 public:
     AddressBarDialog(QQuickItem* parent = nullptr);
+    bool backEnabled() { return _backEnabled; }
+    bool forwardEnabled() { return _forwardEnabled; }
+
+signals:
+    void backEnabledChanged();
+    void forwardEnabledChanged();
 
 protected:
     void displayAddressOfflineMessage();
@@ -30,6 +38,9 @@ protected:
     Q_INVOKABLE void loadAddress(const QString& address);
     Q_INVOKABLE void loadBack();
     Q_INVOKABLE void loadForward();
+
+    bool _backEnabled;
+    bool _forwardEnabled;
 };
 
 #endif

interface/src/ui/overlays/Line3DOverlay.cpp

@@ -32,6 +32,16 @@ Line3DOverlay::Line3DOverlay(const Line3DOverlay* line3DOverlay) :
 Line3DOverlay::~Line3DOverlay() {
 }
 
+AABox Line3DOverlay::getBounds() const {
+    auto start = _position + _start;
+    auto end = _position + _end;
+
+    auto min = glm::min(start, end);
+    auto max = glm::max(start, end);
+
+    return AABox(min, max - min);
+}
+
 void Line3DOverlay::render(RenderArgs* args) {
     if (!_visible) {
         return; // do nothing if we're not visible

interface/src/ui/overlays/Line3DOverlay.h

@@ -21,6 +21,7 @@ public:
     Line3DOverlay(const Line3DOverlay* line3DOverlay);
     ~Line3DOverlay();
     virtual void render(RenderArgs* args);
+    virtual AABox getBounds() const override;
 
     // getters
     const glm::vec3& getStart() const { return _start; }

libraries/networking/src/AddressManager.h

@@ -62,6 +62,9 @@ public:
 
     void loadSettings(const QString& lookupString = QString());
 
+    const QStack<QUrl>& getBackStack() const { return _backStack; }
+    const QStack<QUrl>& getForwardStack() const { return _forwardStack; }
+
 public slots:
     void handleLookupString(const QString& lookupString);
 

libraries/script-engine/src/AbstractControllerScriptingInterface.h

@@ -104,6 +104,7 @@ signals:
 
     void mouseMoveEvent(const MouseEvent& event, unsigned int deviceID = 0);
     void mousePressEvent(const MouseEvent& event, unsigned int deviceID = 0);
+    void mouseDoublePressEvent(const MouseEvent& event, unsigned int deviceID = 0);
     void mouseReleaseEvent(const MouseEvent& event, unsigned int deviceID = 0);
 
     void touchBeginEvent(const TouchEvent& event);