From df3049cb4487d9d3491e2e04a5f680cf0095e97a Mon Sep 17 00:00:00 2001 From: amer cerkic Date: Tue, 30 Apr 2019 11:49:33 -0700 Subject: [PATCH] simplified way to switch to system cursor if non hmd mode --- interface/src/Application.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index bd69934b27..9a2d320329 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -3591,7 +3591,14 @@ void Application::setPreferAvatarFingerOverStylus(bool value) { void Application::setPreferredCursor(const QString& cursorName) { qCDebug(interfaceapp) << "setPreferredCursor" << cursorName; - _preferredCursor.set(cursorName.isEmpty() ? Cursor::Manager::getIconName(Cursor::Icon::SYSTEM) : cursorName); + + if (_displayPlugin && _displayPlugin->isHmd()) { + _preferredCursor.set(cursorName.isEmpty() ? DEFAULT_CURSOR_NAME : cursorName); + } + else { + _preferredCursor.set(cursorName.isEmpty() ? Cursor::Manager::getIconName(Cursor::Icon::SYSTEM) : cursorName); + } + showCursor(Cursor::Manager::lookupIcon(_preferredCursor.get())); }