Merge remote-tracking branch 'nv/master' into hyperlink-photo

2025-04-20 03:44:02 +02:00 · 2015-06-26 09:30:05 -07:00 · 2015-06-26 09:30:05 -07:00 · a02fabf398
commit a02fabf398
parent 81770cfeb2 23f4f7d824
5 changed files with 82 additions and 19 deletions
--- a/interface/resources/images/NoPictureProvided.svg
+++ b/interface/resources/images/NoPictureProvided.svg
@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xl="http://www.w3.org/1999/xlink" version="1.1" viewBox="618 289 264 186" width="22pc" height="186pt"><metadata xmlns:dc="http://purl.org/dc/elements/1.1/"><dc:date>2015-06-22 17:35Z</dc:date><!-- Produced by OmniGraffle Professional 5.4.4 --></metadata><defs><font-face font-family="Helvetica" font-size="19" units-per-em="1000" underline-position="-75.683594" underline-thickness="49.316406" slope="0" x-height="522.94922" cap-height="717.28516" ascent="770.01953" descent="-229.98047" font-weight="500"><font-face-src><font-face-name name="Helvetica"/></font-face-src></font-face></defs><g stroke="none" stroke-opacity="1" stroke-dasharray="none" fill="none" fill-opacity="1"><title>Canvas 1</title><g><title>No info</title><path d="M 620 291 L 879.5 291 L 879.5 473 L 620 473 Z" stroke="#999" stroke-linecap="butt" stroke-linejoin="miter" stroke-width="1" stroke-dasharray="4,4"/><text transform="translate(625 370.5)" fill="#ccc"><tspan font-family="Helvetica" font-size="19" font-weight="500" fill="#ccc" x="40.265863" y="19" textLength="174.24707">No Picture Provided </tspan></text></g></g></svg>
--- a/interface/resources/images/header_sep.svg
+++ b/interface/resources/images/header_sep.svg
@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xl="http://www.w3.org/1999/xlink" version="1.1" viewBox="624 233 250 8" width="250pt" height="8pt"><metadata xmlns:dc="http://purl.org/dc/elements/1.1/"><dc:date>2015-06-22 17:35Z</dc:date><!-- Produced by OmniGraffle Professional 5.4.4 --></metadata><defs></defs><g stroke="none" stroke-opacity="1" stroke-dasharray="none" fill="none" fill-opacity="1"><title>Canvas 1</title><g><title>No info</title><line x1="627" y1="236.4375" x2="871" y2="236.4375" stroke="white" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/></g></g></svg>
--- a/interface/resources/images/tooltip_container.svg
+++ b/interface/resources/images/tooltip_container.svg
@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xl="http://www.w3.org/1999/xlink" version="1.1" viewBox="594 183 323 423" width="323pt" height="423pt"><metadata xmlns:dc="http://purl.org/dc/elements/1.1/"><dc:date>2015-06-22 17:35Z</dc:date><!-- Produced by OmniGraffle Professional 5.4.4 --></metadata><defs></defs><g stroke="none" stroke-opacity="1" stroke-dasharray="none" fill="none" fill-opacity="1"><title>Canvas 1</title><g><title>Info</title><path d="M 603 183 L 908 183 C 912.97056 183 917 187.02944 917 192 L 917 597 C 917 601.97056 912.97056 606 908 606 L 603 606 C 598.02944 606 594 601.97056 594 597 L 594 192 C 594 187.02944 598.02944 183 603 183 Z" fill="#333" fill-opacity=".67"/></g></g></svg>
--- a/interface/resources/qml/Tooltip.qml
+++ b/interface/resources/qml/Tooltip.qml
@ -1,31 +1,76 @@
 import Hifi 1.0 as Hifi
-import QtQuick 2.3 as Original
+import QtQuick 2.4
+import QtQuick.Layouts 1.1
 import "controls"
 import "styles"

 Hifi.Tooltip {
    id: root
    HifiConstants { id: hifi }
-    // FIXME adjust position based on the edges of the screen
-    x: (lastMousePosition.x > surfaceSize.width/2) ? lastMousePosition.x - 140 : lastMousePosition.x + 20
-    //y: lastMousePosition.y + 5
-    y: (lastMousePosition.y > surfaceSize.height/2) ? lastMousePosition.y - 70 : lastMousePosition.y + 5
-    implicitWidth: border.implicitWidth 
-    implicitHeight: border.implicitHeight
+    x: lastMousePosition.x + offsetX
+    y: lastMousePosition.y + offsetY
+    property int offsetX: 0
+    property int offsetY: 0
+    width: border.width
+    height: border.height

-    Border {
+    Component.onCompleted: {
+        offsetX = (lastMousePosition.x > surfaceSize.width/2) ? -root.width : 0
+        offsetY = (lastMousePosition.y > surfaceSize.height/2) ? -root.height : 0
+    }
+    
+    Rectangle {
        id: border
-        anchors.fill: parent
-        implicitWidth: text.implicitWidth
-        implicitHeight: Math.max(text.implicitHeight, 64)
+        color: "#7f000000"
+        width: 322
+        height: col.height + hifi.layout.spacing * 2

-        Text {
-            id: text
-            anchors.fill: parent
-            anchors.margins: 16
-            font.pixelSize: hifi.fonts.pixelSize / 2
-            text: root.text
-            wrapMode: Original.Text.WordWrap
+        Column {
+            id: col
+            x: hifi.layout.spacing
+            y: hifi.layout.spacing
+            anchors.left: parent.left
+            anchors.leftMargin: hifi.layout.spacing
+            anchors.right: parent.right
+            anchors.rightMargin: hifi.layout.spacing
+            spacing: 5
+
+            Text {
+                id: textPlace
+                color: "white"
+                font.underline: true
+                anchors.left: parent.left
+                anchors.right: parent.right
+                font.pixelSize: hifi.fonts.pixelSize / 2
+                text: root.text
+                wrapMode: Text.WrapAnywhere
+                
+                /* Uncomment for debugging to see the extent of the  
+                Rectangle {
+                    anchors.fill: parent
+                    color: "#7fff00ff"
+                }
+                */
+            }
+
+            Image {
+                id: tooltipPic
+                source: "../images/NoPictureProvided.svg"
+                anchors.left: parent.left
+                anchors.right: parent.right
+                verticalAlignment: Image.AlignVCenter
+            }
+
+            Text {
+                id: textDescription
+                color: "white"
+                width: border.implicitWidth
+                anchors.left: parent.left
+                anchors.right: parent.right
+                font.pixelSize: hifi.fonts.pixelSize / 2
+                text: root.text
+                wrapMode: Text.WrapAnywhere
+            }
        }
    }
-}
+}
--- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp
+++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
@ -43,6 +43,7 @@
 #include "RenderableLineEntityItem.h"
 #include "RenderablePolyVoxEntityItem.h"
 #include "EntitiesRendererLogging.h"
+#include "AddressManager.h"

 EntityTreeRenderer::EntityTreeRenderer(bool wantScripts, AbstractViewStateInterface* viewState, 
                                            AbstractScriptingServicesInterface* scriptingServices) :
@ -836,6 +837,14 @@ void EntityTreeRenderer::mousePressEvent(QMouseEvent* event, unsigned int device
    RayToEntityIntersectionResult rayPickResult = findRayIntersectionWorker(ray, Octree::Lock, precisionPicking);
    if (rayPickResult.intersects) {
        //qCDebug(entitiesrenderer) << "mousePressEvent over entity:" << rayPickResult.entityID;
+
+        QString urlString = rayPickResult.properties.getHref();
+        QUrl url = QUrl(urlString, QUrl::StrictMode);
+        if (url.isValid() && !url.isEmpty()){
+            DependencyManager::get<AddressManager>()->handleLookupString(urlString);
+
+        }
+
        emit mousePressOnEntity(rayPickResult, event, deviceID);

        QScriptValueList entityScriptArgs = createMouseEventArgs(rayPickResult.entityID, event, deviceID);