Better hierarchy (#691)

adriengivry · web-flow · commit 3f6e6741fa68 · 2026-04-13T19:47:55.000-04:00
- Added icons for actors in hierarchy
- Actors are now grayed out in the hierarchy when disabled 
- Improved search bar, and reused it in `ItemPicker` as well
- `TreeNode` now support icons and label color override
diff --git a/Resources/Editor/Textures/Actor.png b/Resources/Editor/Textures/Actor.png
diff --git a/Resources/Editor/Textures/Search.png b/Resources/Editor/Textures/Search.png
diff --git a/Sources/OvCore/include/OvCore/Helpers/GUIDrawer.h b/Sources/OvCore/include/OvCore/Helpers/GUIDrawer.h
@@ -72,6 +72,13 @@ namespace OvCore::Helpers
 
 		static OvUI::Widgets::InputFields::AssetField& DrawScene(OvUI::Internal::WidgetContainer& p_root, const std::string& p_name, std::function<std::string()> p_gatherer, std::function<void(std::string)> p_provider);
 
+		/**
+		* Creates a full-width search bar with an optional search icon
+		* @param p_root
+		* @param p_searchIconTextureID
+		*/
+		static OvUI::Widgets::InputFields::InputText& DrawSearchBar(OvUI::Internal::WidgetContainer& p_root, uint32_t p_searchIconTextureID = 0);
+
 		template <typename T>
 		static void DrawScalar(OvUI::Internal::WidgetContainer& p_root, const std::string& p_name, std::function<T(void)> p_gatherer, std::function<void(T)> p_provider, float p_step = 1.f, T p_min = std::numeric_limits<T>::min(), T p_max = std::numeric_limits<T>::max());
 		static void DrawBoolean(OvUI::Internal::WidgetContainer& p_root, const std::string& p_name, std::function<bool(void)> p_gatherer, std::function<void(bool)> p_provider);
diff --git a/Sources/OvCore/src/OvCore/Helpers/GUIDrawer.cpp b/Sources/OvCore/src/OvCore/Helpers/GUIDrawer.cpp
@@ -458,3 +458,11 @@ void OvCore::Helpers::GUIDrawer::DrawColor(OvUI::Internal::WidgetContainer & p_r
 	dispatcher.RegisterGatherer(p_gatherer);
 	dispatcher.RegisterProvider(p_provider);
 }
+
+OvUI::Widgets::InputFields::InputText& OvCore::Helpers::GUIDrawer::DrawSearchBar(OvUI::Internal::WidgetContainer& p_root, uint32_t p_searchIconTextureID)
+{
+	auto& searchBar = p_root.CreateWidget<OvUI::Widgets::InputFields::InputText>();
+	searchBar.fullWidth = true;
+	searchBar.iconTextureID = p_searchIconTextureID;
+	return searchBar;
+}
diff --git a/Sources/OvEditor/src/OvEditor/Core/EditorResources.cpp b/Sources/OvEditor/src/OvEditor/Core/EditorResources.cpp
@@ -131,7 +131,9 @@ OvEditor::Core::EditorResources::EditorResources(const std::string& p_editorAsse
 		{"Directional_Light", CreateTexture<NEAREST>(texturesFolder / "Directional_Light.png")},
 		{"Ambient_Box_Light", CreateTexture<NEAREST>(texturesFolder / "Ambient_Box_Light.png")},
 		{"Ambient_Sphere_Light", CreateTexture<NEAREST>(texturesFolder / "Ambient_Sphere_Light.png")},
-		{"Empty_Texture", CreateTexture<LINEAR>(texturesFolder / "Empty_Texture.png")}
+		{"Empty_Texture", CreateTexture<LINEAR>(texturesFolder / "Empty_Texture.png")},
+		{"Actor", CreateTexture<LINEAR>(texturesFolder / "Actor.png")},
+		{"Search", CreateTexture<LINEAR>(texturesFolder / "Search.png")}
 	};
 
 	m_models = {
diff --git a/Sources/OvEditor/src/OvEditor/Panels/Hierarchy.cpp b/Sources/OvEditor/src/OvEditor/Panels/Hierarchy.cpp
@@ -16,6 +16,7 @@
 #include <OvDebug/Logger.h>
 
 #include <OvCore/Global/ServiceLocator.h>
+#include <OvCore/Helpers/GUIDrawer.h>
 
 #include <OvCore/ECS/Components/CCamera.h>
 #include <OvCore/ECS/Components/CPointLight.h>
@@ -31,6 +32,7 @@
 
 #include <OvUI/Plugins/ContextualMenu.h>
 
+#include "OvEditor/Core/EditorResources.h"
 #include "OvEditor/Utils/ActorCreationMenu.h"
 
 class ActorContextualMenu : public OvUI::Plugins::ContextualMenu
@@ -149,7 +151,13 @@ OvEditor::Panels::Hierarchy::Hierarchy
 	m_actions(CreateWidget<OvUI::Widgets::Layout::Group>()),
 	m_actors(CreateWidget<OvUI::Widgets::Layout::Group>())
 {
-	auto& searchBar = m_actions.CreateWidget<OvUI::Widgets::InputFields::InputText>();
+	const uint32_t searchIconID = []{
+		if (auto* tex = EDITOR_CONTEXT(editorResources)->GetTexture("Search"))
+			return tex->GetTexture().GetID();
+		return 0u;
+	}();
+
+	auto& searchBar = OvCore::Helpers::GUIDrawer::DrawSearchBar(m_actions, searchIconID);
 	searchBar.ContentChangedEvent += [this](const std::string& p_content)
 	{
 		founds.clear();
@@ -334,6 +342,10 @@ void OvEditor::Panels::Hierarchy::AddActorByInstance(OvCore::ECS::Actor & p_acto
 {
 	auto& textSelectable = m_actors.CreateWidget<OvUI::Widgets::Layout::TreeNode>(p_actor.GetName(), true);
 	textSelectable.leaf = true;
+
+	if (auto* actorTexture = EDITOR_CONTEXT(editorResources)->GetTexture("Actor"))
+		textSelectable.iconTextureID = actorTexture->GetTexture().GetID();
+
 	textSelectable.AddPlugin<ActorContextualMenu>(&p_actor, &textSelectable);
 	textSelectable.AddPlugin<OvUI::Plugins::DDSource<std::pair<OvCore::ECS::Actor*, OvUI::Widgets::Layout::TreeNode*>>>("Actor", "Attach to...", std::make_pair(&p_actor, &textSelectable));
 	textSelectable.AddPlugin<OvUI::Plugins::DDTarget<std::pair<OvCore::ECS::Actor*, OvUI::Widgets::Layout::TreeNode*>>>("Actor").DataReceivedEvent += [&p_actor, &textSelectable](std::pair<OvCore::ECS::Actor*, OvUI::Widgets::Layout::TreeNode*> p_element)
@@ -349,7 +361,15 @@ void OvEditor::Panels::Hierarchy::AddActorByInstance(OvCore::ECS::Actor & p_acto
 	auto& dispatcher = textSelectable.AddPlugin<OvUI::Plugins::DataDispatcher<std::string>>();
 
 	OvCore::ECS::Actor* targetPtr = &p_actor;
-	dispatcher.RegisterGatherer([targetPtr] { return targetPtr->GetName(); });
+	dispatcher.RegisterGatherer([targetPtr, &textSelectable]
+	{
+		const bool isActive = targetPtr->IsSelfActive();
+		textSelectable.overrideLabelColor = !isActive;
+		if (!isActive)
+			textSelectable.labelColor = {0.5f, 0.5f, 0.5f, 1.0f};
+
+		return targetPtr->GetName();
+	});
 
 	m_widgetActorLink[targetPtr] = &textSelectable;
 
diff --git a/Sources/OvEditor/src/OvEditor/Panels/ItemPicker.cpp b/Sources/OvEditor/src/OvEditor/Panels/ItemPicker.cpp
@@ -10,6 +10,9 @@
 #include <imgui.h>
 
 #include <OvEditor/Panels/ItemPicker.h>
+#include <OvEditor/Core/EditorActions.h>
+
+#include <OvCore/Helpers/GUIDrawer.h>
 
 #include <OvUI/Widgets/InputFields/InputText.h>
 #include <OvUI/Widgets/Layout/Group.h>
@@ -44,7 +47,13 @@ ItemPicker::ItemPicker(
 {
 	minSize = { 250.f, 250.f };
 
-	m_searchField = &CreateWidget<OvUI::Widgets::InputFields::InputText>("", "Search");
+	const uint32_t searchIconID = []{
+		if (auto* tex = EDITOR_CONTEXT(editorResources)->GetTexture("Search"))
+			return tex->GetTexture().GetID();
+		return 0u;
+	}();
+
+	m_searchField = &OvCore::Helpers::GUIDrawer::DrawSearchBar(*this, searchIconID);
 	m_searchField->ContentChangedEvent += [this](const std::string& p_text)
 	{
 		FilterList(p_text);
diff --git a/Sources/OvUI/include/OvUI/Widgets/InputFields/InputText.h b/Sources/OvUI/include/OvUI/Widgets/InputFields/InputText.h
@@ -33,6 +33,9 @@ namespace OvUI::Widgets::InputFields
 		std::string label;
 		bool selectAllOnClick = false;
 		bool focusOnNextDraw = false;
+		bool fullWidth = false;
+		uint32_t iconTextureID = 0;
+		float iconSize = 16.f;
 		OvTools::Eventing::Event<std::string> ContentChangedEvent;
 		OvTools::Eventing::Event<std::string> EnterPressedEvent;
 	};
diff --git a/Sources/OvUI/include/OvUI/Widgets/Layout/TreeNode.h b/Sources/OvUI/include/OvUI/Widgets/Layout/TreeNode.h
@@ -11,6 +11,7 @@
 #include <OvTools/Eventing/Event.h>
 
 #include "OvUI/Internal/WidgetContainer.h"
+#include "OvUI/Types/Color.h"
 #include "OvUI/Widgets/DataWidget.h"
 
 namespace OvUI::Widgets::Layout
@@ -51,6 +52,11 @@ namespace OvUI::Widgets::Layout
 		bool selected = false;
 		bool leaf = false;
 
+		uint32_t iconTextureID = 0;
+		float iconSize = 16.f;
+		bool overrideLabelColor = false;
+		Types::Color labelColor{1.0f, 1.0f, 1.0f, 1.0f};
+
 		OvTools::Eventing::Event<> ClickedEvent;
 		OvTools::Eventing::Event<> DoubleClickedEvent;
 		OvTools::Eventing::Event<> OpenedEvent;
diff --git a/Sources/OvUI/src/OvUI/Widgets/InputFields/InputText.cpp b/Sources/OvUI/src/OvUI/Widgets/InputFields/InputText.cpp
@@ -23,10 +23,39 @@ void OvUI::Widgets::InputFields::InputText::_Draw_Impl()
 		focusOnNextDraw = false;
 	}
 
+	const bool hasIcon = iconTextureID != 0;
+
+	if (hasIcon)
+	{
+		const ImVec2 padding = ImGui::GetStyle().FramePadding;
+		ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(padding.x + iconSize + padding.x, padding.y));
+	}
+
+	if (fullWidth)
+		ImGui::SetNextItemWidth(-FLT_MIN);
+
 	content.resize(256, '\0');
 	bool enterPressed = ImGui::InputText((label + m_widgetID).c_str(), &content[0], 256, ImGuiInputTextFlags_EnterReturnsTrue | (selectAllOnClick ? ImGuiInputTextFlags_AutoSelectAll : 0));
 	content = content.c_str();
 
+	if (hasIcon)
+	{
+		ImGui::PopStyleVar();
+
+		ImDrawList* drawList = ImGui::GetWindowDrawList();
+		const ImVec2 rectMin = ImGui::GetItemRectMin();
+		const ImVec2 rectMax = ImGui::GetItemRectMax();
+		const float frameHeight = rectMax.y - rectMin.y;
+		const float padding = ImGui::GetStyle().FramePadding.y;
+		const float fitSize = std::min(iconSize, frameHeight - padding * 2.0f);
+		const float centerY = (rectMin.y + rectMax.y) * 0.5f;
+		const float iconX = rectMin.x + ImGui::GetStyle().FramePadding.x;
+		drawList->AddImage(iconTextureID,
+			ImVec2(iconX, centerY - fitSize * 0.5f),
+			ImVec2(iconX + fitSize, centerY + fitSize * 0.5f),
+			ImVec2(0.f, 1.f), ImVec2(1.f, 0.f));
+	}
+
 	if (content != previousContent)
 	{
 		ContentChangedEvent.Invoke(content);
diff --git a/Sources/OvUI/src/OvUI/Widgets/Layout/TreeNode.cpp b/Sources/OvUI/src/OvUI/Widgets/Layout/TreeNode.cpp
@@ -53,9 +53,46 @@ void OvUI::Widgets::Layout::TreeNode::_Draw_Impl()
 	if (selected)			flags |= ImGuiTreeNodeFlags_Selected;
 	if (leaf)				flags |= ImGuiTreeNodeFlags_Leaf;
 
-	bool opened = ImGui::TreeNodeEx((name + m_widgetID).c_str(), flags);
+	if (overrideLabelColor)
+		ImGui::PushStyleColor(ImGuiCol_Text, {labelColor.r, labelColor.g, labelColor.b, labelColor.a});
 
-    if (ImGui::IsItemClicked() && (ImGui::GetMousePos().x - ImGui::GetItemRectMin().x) > ImGui::GetTreeNodeToLabelSpacing())
+	const bool hasIcon = iconTextureID != 0;
+	bool opened;
+	bool itemClicked = false;
+
+	if (hasIcon)
+	{
+		flags |= ImGuiTreeNodeFlags_SpanAvailWidth;
+		opened = ImGui::TreeNodeEx(m_widgetID.c_str(), flags);
+		itemClicked = ImGui::IsItemClicked();
+
+		// Draw icon and text via the draw list so they don't create new ImGui
+		// items (the TreeNodeEx must remain the "last item" for plugins like
+		// ContextualMenu that call BeginPopupContextItem).
+		ImDrawList* drawList = ImGui::GetWindowDrawList();
+		const float startX = ImGui::GetItemRectMin().x + ImGui::GetTreeNodeToLabelSpacing();
+		const float centerY = (ImGui::GetItemRectMin().y + ImGui::GetItemRectMax().y) * 0.5f;
+
+		const ImU32 tintCol = overrideLabelColor
+			? ImGui::ColorConvertFloat4ToU32({labelColor.r, labelColor.g, labelColor.b, labelColor.a})
+			: IM_COL32_WHITE;
+		const ImVec2 iconMin(startX, centerY - iconSize * 0.5f);
+		const ImVec2 iconMax(startX + iconSize, centerY + iconSize * 0.5f);
+		drawList->AddImage(iconTextureID, iconMin, iconMax, ImVec2(0.f, 1.f), ImVec2(1.f, 0.f), tintCol);
+
+		const float textX = startX + iconSize + ImGui::GetStyle().ItemSpacing.x;
+		const ImU32 textCol = overrideLabelColor
+			? tintCol
+			: ImGui::GetColorU32(ImGuiCol_Text);
+		drawList->AddText(ImVec2(textX, ImGui::GetItemRectMin().y), textCol, name.c_str());
+	}
+	else
+	{
+		opened = ImGui::TreeNodeEx((name + m_widgetID).c_str(), flags);
+		itemClicked = ImGui::IsItemClicked();
+	}
+
+    if (itemClicked && (ImGui::GetMousePos().x - ImGui::GetItemRectMin().x) > ImGui::GetTreeNodeToLabelSpacing())
     {
         ClickedEvent.Invoke();
 
@@ -65,6 +102,9 @@ void OvUI::Widgets::Layout::TreeNode::_Draw_Impl()
         }
     }
 
+	if (overrideLabelColor)
+		ImGui::PopStyleColor();
+
 	if (opened)
 	{
 		if (!prevOpened)
