From f8f22e2e092ef2ffffad96920ed663dcbca714f7 Mon Sep 17 00:00:00 2001 From: BlackMATov Date: Mon, 20 Apr 2020 19:14:39 +0700 Subject: [PATCH] fixes after imgui update --- sources/enduro2d/high/widgets/hierarchy_widget.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/sources/enduro2d/high/widgets/hierarchy_widget.cpp b/sources/enduro2d/high/widgets/hierarchy_widget.cpp index eacc9198..b4f23922 100644 --- a/sources/enduro2d/high/widgets/hierarchy_widget.cpp +++ b/sources/enduro2d/high/widgets/hierarchy_widget.cpp @@ -65,7 +65,11 @@ namespace }); if ( ImGui::IsItemClicked() ) { - e.select(owner); + if ( ImGui::IsItemToggledOpen() || e.selection() != owner ) { + e.select(owner); + } else { + e.clear_selection(); + } } if ( ImGui::BeginPopupContextItem() ) { @@ -137,12 +141,6 @@ namespace { e.selection().destroy(); } - - if ( ImGui::IsMouseClicked(ImGuiMouseButton_Left) - && ImGui::IsWindowHovered(ImGuiHoveredFlags_RootWindow) ) - { - e.clear_selection(); - } } }