Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 11:28:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'cursor_fix' of github.com:jherico/hifi into actions-over-wire

Browse source
This commit is contained in:
Seth Alves 2015-06-27 10:45:34 -07:00
commit 567d98dfab
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
interface/src/ui/ApplicationCompositor.cpp
View file

@ -132,21 +132,22 @@ ApplicationCompositor::ApplicationCompositor() {
// check the format of this href string before we parse it // check the format of this href string before we parse it
QString hrefString = properties.getHref(); 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(); 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); cursor->setIcon(Cursor::Icon::LINK);
} else { } else {
_hoverItemTitle.clear();
_hoverItemDescription.clear();
cursor->setIcon(Cursor::Icon::DEFAULT); cursor->setIcon(Cursor::Icon::DEFAULT);
} }
} }