From f22be1273a748bc92a50efcc90a1171b16d9645e Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Fri, 19 May 2017 16:57:12 -0400 Subject: [PATCH] Fix property visibility to correctly ignore hidden properties --- include/openspace/properties/property.h | 6 +++--- modules/onscreengui/src/gui.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/openspace/properties/property.h b/include/openspace/properties/property.h index 709656fc6b..5fbc8e6a78 100644 --- a/include/openspace/properties/property.h +++ b/include/openspace/properties/property.h @@ -68,9 +68,9 @@ public: */ enum class Visibility { All = 3, ///< Visible for all types, no matter what - Developer = 2, ///< Visible in Developer mode - User = 1, ///< Visible in User mode - Hidden = 0 ///< Never visible + Hidden = 2, ///< Never visible + Developer = 1, ///< Visible in Developer mode + User = 0 ///< Visible in User mode }; /** diff --git a/modules/onscreengui/src/gui.cpp b/modules/onscreengui/src/gui.cpp index e114c2d8df..7a44eb4583 100644 --- a/modules/onscreengui/src/gui.cpp +++ b/modules/onscreengui/src/gui.cpp @@ -229,7 +229,7 @@ GUI::GUI() , _property("Properties") , _screenSpaceProperty("ScreenSpace Properties") , _virtualProperty("Virtual Properties") - , _currentVisibility(properties::Property::Visibility::All) + , _currentVisibility(properties::Property::Visibility::Developer) { addPropertySubOwner(_help); addPropertySubOwner(_origin); @@ -634,7 +634,7 @@ void GUI::renderAndUpdatePropertyVisibility() { int t = static_cast>(_currentVisibility); // Array is sorted by importance - std::array items = { "None", "User", "Developer", "All"}; + std::array items = { "User", "Developer", "Hidden", "All"}; ImGui::Combo("PropertyVisibility", &t, items.data(), static_cast(items.size())); _currentVisibility = static_cast(t);