From 3b987c1e7313aa3b85e605ddf1b9b13ed94fca2a Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Fri, 26 Jun 2015 18:14:31 -0700 Subject: [PATCH 1/2] Fixing always-on link cursor --- interface/src/ui/ApplicationCompositor.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/interface/src/ui/ApplicationCompositor.cpp b/interface/src/ui/ApplicationCompositor.cpp index 98da0bfa2f..339b174791 100644 --- a/interface/src/ui/ApplicationCompositor.cpp +++ b/interface/src/ui/ApplicationCompositor.cpp @@ -132,19 +132,18 @@ ApplicationCompositor::ApplicationCompositor() { // check the format of this href string before we parse it QString hrefString = properties.getHref(); - if (!hrefString.startsWith("hifi:")) { - hrefString.prepend("hifi://"); - } - - // parse out a QUrl from the hrefString - QUrl href = QUrl(hrefString); - - _hoverItemTitle = href.host(); - _hoverItemDescription = properties.getDescription(); auto cursor = Cursor::Manager::instance().getCursor(); + if (!hrefString.isEmpty()) { + if (!hrefString.startsWith("hifi:")) { + hrefString.prepend("hifi://"); + } - if (!href.isEmpty()) { + // parse out a QUrl from the hrefString + QUrl href = QUrl(hrefString); + + _hoverItemTitle = href.host(); + _hoverItemDescription = properties.getDescription(); cursor->setIcon(Cursor::Icon::LINK); } else { cursor->setIcon(Cursor::Icon::DEFAULT); From e6fade8c13d2c48f29d92d03fb9caf51b84b9ee7 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Fri, 26 Jun 2015 18:16:56 -0700 Subject: [PATCH 2/2] Prevent tooltips from appearing with stale data --- interface/src/ui/ApplicationCompositor.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interface/src/ui/ApplicationCompositor.cpp b/interface/src/ui/ApplicationCompositor.cpp index 339b174791..6cdf690d99 100644 --- a/interface/src/ui/ApplicationCompositor.cpp +++ b/interface/src/ui/ApplicationCompositor.cpp @@ -146,6 +146,8 @@ ApplicationCompositor::ApplicationCompositor() { _hoverItemDescription = properties.getDescription(); cursor->setIcon(Cursor::Icon::LINK); } else { + _hoverItemTitle.clear(); + _hoverItemDescription.clear(); cursor->setIcon(Cursor::Icon::DEFAULT); } }