From 08a6eb4dd399ef4f5cdeca95ae4ab8fb50efe97f Mon Sep 17 00:00:00 2001 From: David Back Date: Tue, 24 Oct 2017 15:50:09 -0700 Subject: [PATCH] reset tablet contextual mode back to false when toggling tablet show/hide --- interface/src/scripting/HMDScriptingInterface.cpp | 9 +++++++++ interface/src/scripting/HMDScriptingInterface.h | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/interface/src/scripting/HMDScriptingInterface.cpp b/interface/src/scripting/HMDScriptingInterface.cpp index 0b6800395f..31b8f74e9e 100644 --- a/interface/src/scripting/HMDScriptingInterface.cpp +++ b/interface/src/scripting/HMDScriptingInterface.cpp @@ -108,6 +108,15 @@ void HMDScriptingInterface::openTablet(bool contextualMode) { _tabletContextualMode = contextualMode; } +void HMDScriptingInterface::toggleShouldShowTablet() { + setShouldShowTablet(!getShouldShowTablet()); +} + +void HMDScriptingInterface::setShouldShowTablet(bool value) { + _showTablet = value; + _tabletContextualMode = false; +} + QScriptValue HMDScriptingInterface::getHUDLookAtPosition2D(QScriptContext* context, QScriptEngine* engine) { glm::vec3 hudIntersection; auto instance = DependencyManager::get(); diff --git a/interface/src/scripting/HMDScriptingInterface.h b/interface/src/scripting/HMDScriptingInterface.h index 76bab77cbb..ef8ea95704 100644 --- a/interface/src/scripting/HMDScriptingInterface.h +++ b/interface/src/scripting/HMDScriptingInterface.h @@ -89,8 +89,8 @@ public: bool isMounted() const; - void toggleShouldShowTablet() { _showTablet = !_showTablet; } - void setShouldShowTablet(bool value) { _showTablet = value; } + void toggleShouldShowTablet(); + void setShouldShowTablet(bool value); bool getShouldShowTablet() const { return _showTablet; } bool getTabletContextualMode() const { return _tabletContextualMode; }