From bedd0628b9558c59b2ed425bf1909edbfbd3c51d Mon Sep 17 00:00:00 2001 From: Dante Ruiz Date: Wed, 12 Jul 2017 00:51:07 +0100 Subject: [PATCH 1/4] allowed tablet to toggle when a dialog is open --- interface/src/Application.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index ddd1870723..352d9e28e2 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1706,7 +1706,7 @@ void Application::toggleTabletUI(bool shouldOpen) const { auto hmd = DependencyManager::get(); TabletProxy* tablet = dynamic_cast(tabletScriptingInterface->getTablet(SYSTEM_TABLET)); bool messageOpen = tablet->isMessageDialogOpen(); - if ((!messageOpen || (messageOpen && !hmd->getShouldShowTablet())) && !(shouldOpen && hmd->getShouldShowTablet())) { + if (!(shouldOpen && hmd->getShouldShowTablet())) { auto HMD = DependencyManager::get(); HMD->toggleShouldShowTablet(); } From 070db2922d1ccf0741af18a936dfdf61c43d6bbc Mon Sep 17 00:00:00 2001 From: Dante Ruiz Date: Thu, 13 Jul 2017 18:40:38 +0100 Subject: [PATCH 2/4] fixed warning compile error --- interface/src/Application.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 352d9e28e2..ef6ad0771d 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1,3 +1,4 @@ + // // Application.cpp // interface/src @@ -1705,7 +1706,6 @@ void Application::toggleTabletUI(bool shouldOpen) const { auto tabletScriptingInterface = DependencyManager::get(); auto hmd = DependencyManager::get(); TabletProxy* tablet = dynamic_cast(tabletScriptingInterface->getTablet(SYSTEM_TABLET)); - bool messageOpen = tablet->isMessageDialogOpen(); if (!(shouldOpen && hmd->getShouldShowTablet())) { auto HMD = DependencyManager::get(); HMD->toggleShouldShowTablet(); From b46dc7d389224d3ee609974df5ef406885502911 Mon Sep 17 00:00:00 2001 From: Dante Ruiz Date: Thu, 13 Jul 2017 18:42:26 +0100 Subject: [PATCH 3/4] removed space --- interface/src/Application.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index ef6ad0771d..237fc3f6a4 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1,4 +1,3 @@ - // // Application.cpp // interface/src From 03fbd2a1e6a029723ebb063e7392bd38ce593d34 Mon Sep 17 00:00:00 2001 From: Dante Ruiz Date: Thu, 13 Jul 2017 19:12:34 +0100 Subject: [PATCH 4/4] fixed another warning --- interface/src/Application.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 237fc3f6a4..6a01b35230 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1704,7 +1704,6 @@ QString Application::getUserAgent() { void Application::toggleTabletUI(bool shouldOpen) const { auto tabletScriptingInterface = DependencyManager::get(); auto hmd = DependencyManager::get(); - TabletProxy* tablet = dynamic_cast(tabletScriptingInterface->getTablet(SYSTEM_TABLET)); if (!(shouldOpen && hmd->getShouldShowTablet())) { auto HMD = DependencyManager::get(); HMD->toggleShouldShowTablet();