Revert native ui back to F1 keybind for toggling

This commit is contained in:
Alexander Bock
2018-11-21 11:14:11 -05:00
parent d9eb174f27
commit 9d0f0e00df
3 changed files with 10 additions and 46 deletions

View File

@@ -130,12 +130,10 @@ GUI::GUI()
)
, _showHelpText(ShowHelpInfo, true)
, _helpTextDelay(HelpTextDelayInfo, 1.0, 0.0, 10.0)
, _allHidden(HiddenInfo, true)
{
for (GuiComponent* comp : _components) {
addPropertySubOwner(comp);
}
_featuredProperties.setEnabled(true);
_spaceTime.setEnabled(true);
{
@@ -159,8 +157,6 @@ GUI::GUI()
_helpTextDelay.onChange(std::move(helpTextDelayFunc));
addProperty(_helpTextDelay);
}
addProperty(_allHidden);
}
GUI::~GUI() {} // NOLINT
@@ -427,10 +423,8 @@ void GUI::endFrame() {
_performance.render();
}
if (!_allHidden) {
if (_isEnabled) {
render();
}
if (_isEnabled) {
render();
for (GuiComponent* comp : _components) {
if (comp->isEnabled()) {
@@ -441,6 +435,10 @@ void GUI::endFrame() {
ImGui::Render();
const bool shouldRender = _performance.isEnabled() || _isEnabled;
if (!shouldRender) {
return;
}
// Drawing
ImDrawData* drawData = ImGui::GetDrawData();
@@ -706,9 +704,4 @@ void GUI::renderAndUpdatePropertyVisibility() {
_featuredProperties.setVisibility(_currentVisibility);
}
void GUI::setHidden(bool isHidden) {
_allHidden = isHidden;
}
} // namespace openspace::gui