Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 16:55:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

found a more simplified way to stop rendering the mouse unless its the Reticle cursor

Browse source
This commit is contained in:
amer cerkic 2019-04-30 11:34:11 -07:00
parent 7d2b75673c
commit 978108b3ba
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/src/Application.cpp
View file

@ -3591,7 +3591,7 @@ void Application::setPreferAvatarFingerOverStylus(bool value) {
void Application::setPreferredCursor(const QString& cursorName) {
qCDebug(interfaceapp) << "setPreferredCursor" << cursorName;
_preferredCursor.set(cursorName.isEmpty() ? DEFAULT_CURSOR_NAME : cursorName);
_preferredCursor.set(cursorName.isEmpty() ? Cursor::Manager::getIconName(Cursor::Icon::SYSTEM) : cursorName);
showCursor(Cursor::Manager::lookupIcon(_preferredCursor.get()));
}
@ -5041,11 +5041,8 @@ void Application::idle() {
}
}
#endif
if((displayPlugin && displayPlugin->isHmd()) || _preferredCursor.get() == Cursor::Manager::ICON_NAMES[Cursor::Icon::RETICLE]){
checkChangeCursor();
}
checkChangeCursor();
#if !defined(DISABLE_QML)
auto stats = Stats::getInstance();

2
libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
View file

@ -683,7 +683,7 @@ void OpenGLDisplayPlugin::compositeLayers() {
}
auto& cursorManager = Cursor::Manager::instance();
if (isHmd() || cursorManager.getCursor()->getIcon() == Cursor::RETICLE ) {
if (isHmd() || cursorManager.getCursor()->getIcon() == Cursor::RETICLE) {
auto compositorHelper = DependencyManager::get<CompositorHelper>();
// Draw the pointer last so it's on top of everything
if (compositorHelper->getReticleVisible()) {