From 6b14a64c8c6653ab44a01a921a414f7e1e957a2e Mon Sep 17 00:00:00 2001 From: Niraj Venkat Date: Thu, 25 Jun 2015 15:15:44 -0700 Subject: [PATCH] Formatting changes and teleport on click --- interface/resources/qml/Tooltip.qml | 10 ++++------ libraries/entities-renderer/src/EntityTreeRenderer.cpp | 9 +++++++++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/interface/resources/qml/Tooltip.qml b/interface/resources/qml/Tooltip.qml index d8ba62840a..43d4628063 100644 --- a/interface/resources/qml/Tooltip.qml +++ b/interface/resources/qml/Tooltip.qml @@ -33,10 +33,10 @@ Hifi.Tooltip { Text { id: textPlace color: "#ffffff" - width: border.implicitWidth + implicitWidth: 322 //anchors.fill: parent anchors.margins: 5 - font.pixelSize: hifi.fonts.pixelSize / 2 + font.pixelSize: hifi.fonts.pixelSize * 1.5 text: root.text wrapMode: Original.Text.WrapAnywhere } @@ -46,17 +46,15 @@ Hifi.Tooltip { source: "../images/NoPictureProvided.svg" //anchors.fill: parent anchors.margins: 5 - verticalAlignment: Original.Image.AlignVCenter - //horizontalAlignment: Image.AlignHCenter } Text { id: textDescription color: "#ffffff" - width: border.implicitWidth + implicitWidth: 322 //anchors.fill: parent anchors.margins: 5 - font.pixelSize: hifi.fonts.pixelSize / 2 + font.pixelSize: hifi.fonts.pixelSize text: root.text wrapMode: Original.Text.WrapAnywhere } diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp index fe580eb137..0ea6080165 100644 --- 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()->handleLookupString(urlString); + + } + emit mousePressOnEntity(rayPickResult, event, deviceID); QScriptValueList entityScriptArgs = createMouseEventArgs(rayPickResult.entityID, event, deviceID);