From d1526c25b2d39722aa9e551f17beb79b52db5614 Mon Sep 17 00:00:00 2001 From: Niraj Venkat Date: Tue, 23 Jun 2015 10:08:48 -0700 Subject: [PATCH] Starting new tooltip design in QML --- .../resources/images/NoPictureProvided.svg | 3 +++ interface/resources/images/header_sep.svg | 3 +++ .../resources/images/tooltip_container.svg | 3 +++ interface/resources/qml/Tooltip.qml | 25 ++++++++++++++++--- 4 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 interface/resources/images/NoPictureProvided.svg create mode 100644 interface/resources/images/header_sep.svg create mode 100644 interface/resources/images/tooltip_container.svg diff --git a/interface/resources/images/NoPictureProvided.svg b/interface/resources/images/NoPictureProvided.svg new file mode 100644 index 0000000000..003b499bbc --- /dev/null +++ b/interface/resources/images/NoPictureProvided.svg @@ -0,0 +1,3 @@ + + +2015-06-22 17:35ZCanvas 1No infoNo Picture Provided diff --git a/interface/resources/images/header_sep.svg b/interface/resources/images/header_sep.svg new file mode 100644 index 0000000000..ae1434860c --- /dev/null +++ b/interface/resources/images/header_sep.svg @@ -0,0 +1,3 @@ + + +2015-06-22 17:35ZCanvas 1No info diff --git a/interface/resources/images/tooltip_container.svg b/interface/resources/images/tooltip_container.svg new file mode 100644 index 0000000000..2c89bbbd7d --- /dev/null +++ b/interface/resources/images/tooltip_container.svg @@ -0,0 +1,3 @@ + + +2015-06-22 17:35ZCanvas 1Info diff --git a/interface/resources/qml/Tooltip.qml b/interface/resources/qml/Tooltip.qml index 779ba63b3a..10b3006da4 100644 --- a/interface/resources/qml/Tooltip.qml +++ b/interface/resources/qml/Tooltip.qml @@ -6,17 +6,19 @@ import "styles" Hifi.Tooltip { id: root HifiConstants { id: hifi } - x: (lastMousePosition.x > surfaceSize.width/2) ? lastMousePosition.x - 140 : lastMousePosition.x + 20 - y: (lastMousePosition.y > surfaceSize.height/2) ? lastMousePosition.y - 70 : lastMousePosition.y + 5 + x: (lastMousePosition.x > surfaceSize.width/2) ? lastMousePosition.x - root.width : lastMousePosition.x + 20 + y: (lastMousePosition.y > surfaceSize.height/2) ? lastMousePosition.y - root.height : lastMousePosition.y + 5 implicitWidth: border.implicitWidth implicitHeight: border.implicitHeight Border { id: border anchors.fill: parent - implicitWidth: text.implicitWidth - implicitHeight: Math.max(text.implicitHeight, 64) + implicitWidth: tooltipBackground.implicitWidth + //implicitHeight: Math.max(text.implicitHeight, 64) + implicitHeight: tooltipBackground.implicitHeight + /* Text { id: text anchors.fill: parent @@ -24,6 +26,21 @@ Hifi.Tooltip { font.pixelSize: hifi.fonts.pixelSize / 2 text: root.text wrapMode: Original.Text.WordWrap + }*/ + + Image { + id: tooltipBackground + source: "../images/NoPictureProvided.svg" + width: 323 + height: 423 + anchors.fill: parent + + /* + Image { + id: tooltipBackground + source: "../images/NoPictureProvided.svg" + anchors.fill: parent + }*/ } } }