Skip to content

Commit 0b62003

Browse files
committed
Misc fixes
- Move transform.cpp from scene/ to util/. - Reset `m_data.inspect` on Window -> Close All. - Return `ImGui::IsItemClicked()` on `TreeNode::leaf()`.
1 parent 2e090a4 commit 0b62003

File tree

5 files changed

+7
-4
lines changed

5 files changed

+7
-4
lines changed

lib/engine/src/editor/common.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ TreeNode::~TreeNode() {
2626
}
2727

2828
bool TreeNode::leaf(char const* label, int flags) {
29-
if (TreeNode{label, flags | ImGuiTreeNodeFlags_Leaf}) { return true; }
30-
return false;
29+
auto tn = TreeNode{label, flags | ImGuiTreeNodeFlags_Leaf};
30+
return ImGui::IsItemClicked();
3131
}
3232

3333
Window::Menu::Menu(NotClosed<Canvas>) : MenuBar(ImGui::BeginMenuBar()) {}

lib/scene/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,4 @@ target_sources(${PROJECT_NAME} PRIVATE
5252
src/gltf_loader.cpp
5353
src/material.cpp
5454
src/scene.cpp
55-
src/transform.cpp
5655
)

lib/util/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,4 +99,5 @@ target_sources(${PROJECT_NAME} PRIVATE
9999
src/rgb.cpp
100100
src/thread_pool.cpp
101101
src/time.cpp
102+
src/transform.cpp
102103
)
File renamed without changes.

src/gui/main_menu.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@ void WindowMenu::display_menu(editor::NotClosed<editor::MainMenu> main) {
2020
if (ImGui::MenuItem("Frame Stats")) { m_flags.stats = true; }
2121
if (ImGui::MenuItem("Log")) { m_flags.log = true; }
2222
if (ImGui::MenuItem("Resources")) { m_flags.resources = true; }
23-
if (ImGui::MenuItem("Close All")) { m_flags = {}; }
23+
if (ImGui::MenuItem("Close All")) {
24+
m_flags = {};
25+
m_data.inspect = {};
26+
}
2427
ImGui::Separator();
2528
if (ImGui::MenuItem("Dear ImGui Demo")) { m_flags.demo = true; }
2629
}

0 commit comments

Comments
 (0)