From 22dd7f2fb031e819cdc41f5f2599e9ca48650b93 Mon Sep 17 00:00:00 2001 From: Jonathan Bosson Date: Wed, 17 May 2017 11:10:55 -0600 Subject: [PATCH] fix to GUI toggle with keyboard+touch inconsistency --- modules/touch/src/TouchInteraction.cpp | 1 + openspace.cfg | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/touch/src/TouchInteraction.cpp b/modules/touch/src/TouchInteraction.cpp index 3bd752f3d4..502d602da3 100644 --- a/modules/touch/src/TouchInteraction.cpp +++ b/modules/touch/src/TouchInteraction.cpp @@ -669,6 +669,7 @@ void TouchInteraction::decelerate() { void TouchInteraction::resetAfterInput() { ghoul_postcondition(_selected.empty(), "Selected list must be empty after reset"); _lmSuccess = true; + _guiON = OnScreenGUIModule::gui.isEnabled(); //_directTouchMode = false; if (_directTouchMode && _selected.size() > 0) { double spinDelta = _spinSensitivity / OsEng.windowWrapper().averageDeltaTime(); diff --git a/openspace.cfg b/openspace.cfg index 8dbb3803df..6a24c06f5d 100644 --- a/openspace.cfg +++ b/openspace.cfg @@ -10,10 +10,10 @@ return { --SGCTConfig = sgct.config.single{}, -- Fullscreen mode - --SGCTConfig = sgct.config.single{fullScreen=true}, + SGCTConfig = sgct.config.single{fullScreen=true}, -- A regular 1920x1080 window - SGCTConfig = sgct.config.single{1920, 1080, border=false, windowPos={0,0}}, + --SGCTConfig = sgct.config.single{1920, 1080, border=false, windowPos={0,0}}, -- A 1k fisheye rendering -- SGCTConfig = sgct.config.fisheye{1024, 1024},