From 6605bfcd0783a441a5cbe118012db30c8ffeffde Mon Sep 17 00:00:00 2001 From: Ylva Selling Date: Wed, 27 Apr 2022 16:44:14 -0400 Subject: [PATCH] Create property in sky browser module for hiding the targets and browsers when minimizing gui --- modules/skybrowser/skybrowsermodule.cpp | 12 ++++++++++++ modules/skybrowser/skybrowsermodule.h | 1 + 2 files changed, 13 insertions(+) diff --git a/modules/skybrowser/skybrowsermodule.cpp b/modules/skybrowser/skybrowsermodule.cpp index f6ebcd360c..917b4376b1 100644 --- a/modules/skybrowser/skybrowsermodule.cpp +++ b/modules/skybrowser/skybrowsermodule.cpp @@ -80,6 +80,13 @@ namespace { "This determines the speed of the animation of the field of view in the browser." }; + constexpr const openspace::properties::Property::PropertyInfo HideWithGuiInfo = { + "HideTargetsBrowsersWithGui", + "Hide Targets And Browsers With GUI", + "If checked, the targets and browsers will be disabled when the sky browser " + "panel is minimized." + }; + struct [[codegen::Dictionary(SkyBrowserModule)]] Parameters { // [[codegen::verbatim(EnabledInfo.description)]] std::optional enabled; @@ -95,6 +102,9 @@ namespace { // [[codegen::verbatim(BrowserSpeedInfo.description)]] std::optional browserSpeed; + + // [[codegen::verbatim(HideWithGuiInfo.description)]] + std::optional hideTargetsBrowsersGui; }; #include "skybrowsermodule_codegen.cpp" @@ -110,6 +120,7 @@ SkyBrowserModule::SkyBrowserModule() , _cameraRotationSpeed(CameraRotSpeedInfo, 0.5, 0.0, 1.0) , _targetAnimationSpeed(TargetSpeedInfo, 0.2, 0.0, 1.0) , _browserAnimationSpeed(BrowserSpeedInfo, 5.0, 0.0, 10.0) + , _hideTargetsBrowsersWithGui(HideWithGuiInfo, false) { addProperty(_enabled); addProperty(_showTitleInGuiBrowser); @@ -117,6 +128,7 @@ SkyBrowserModule::SkyBrowserModule() addProperty(_cameraRotationSpeed); addProperty(_targetAnimationSpeed); addProperty(_browserAnimationSpeed); + addProperty(_hideTargetsBrowsersWithGui); // Set callback functions global::callback::mouseButton->emplace(global::callback::mouseButton->begin(), diff --git a/modules/skybrowser/skybrowsermodule.h b/modules/skybrowser/skybrowsermodule.h index 98df282c53..8fe65c750b 100644 --- a/modules/skybrowser/skybrowsermodule.h +++ b/modules/skybrowser/skybrowsermodule.h @@ -105,6 +105,7 @@ private: properties::BoolProperty _enabled; properties::BoolProperty _showTitleInGuiBrowser; properties::BoolProperty _allowCameraRotation; + properties::BoolProperty _hideTargetsBrowsersWithGui; properties::DoubleProperty _cameraRotationSpeed; properties::DoubleProperty _targetAnimationSpeed; properties::DoubleProperty _browserAnimationSpeed;