Added support for custom actions in GroupCollapsable (e.g. Edit button for scripts)

Author: adriengivry

Resources/Editor/Textures/Edit.png

@@ -133,7 +133,8 @@ OvEditor::Core::EditorResources::EditorResources(const std::string& p_editorAsse
 		{"Ambient_Sphere_Light", CreateTexture<NEAREST>(texturesFolder / "Ambient_Sphere_Light.png")},
 		{"Empty_Texture", CreateTexture<LINEAR>(texturesFolder / "Empty_Texture.png")},
 		{"Actor", CreateTexture<LINEAR>(texturesFolder / "Actor.png")},
-		{"Search", CreateTexture<LINEAR>(texturesFolder / "Search.png")}
+		{"Search", CreateTexture<LINEAR>(texturesFolder / "Search.png")},
+		{"Edit", CreateTexture<LINEAR>(texturesFolder / "Edit.png")}
 	};
 
 	m_models = {

Sources/OvEditor/src/OvEditor/Core/EditorResources.cpp

@@ -378,6 +378,12 @@ void OvEditor::Panels::Inspector::_DrawBehaviour(Behaviour& p_behaviour, int p_i
 	header.MoveUpEvent += [move] { move(true); };
 	header.MoveDownEvent += [move] { move(false); };
 
+	const uint32_t editIconID = EDITOR_CONTEXT(editorResources)->GetTexture("Edit")->GetTexture().GetID();
+	const auto scriptPath = EDITOR_CONTEXT(projectAssetsPath) / p_behaviour.name;
+	header.actions.push_back({editIconID, [scriptPath] {
+		EDITOR_EXEC(OpenInCodeEditor(scriptPath));
+	}});
+
 	auto& columns = header.CreateWidget<Layout::Columns<2>>();
 	columns.SetID("bhv_" + p_behaviour.name);
 	columns.widths[0] = 200 * OVUI_SCALE;

Sources/OvEditor/src/OvEditor/Panels/Inspector.cpp

@@ -6,6 +6,7 @@
 
 #pragma once
 
+#include <functional>
 #include <vector>
 
 #include <OvTools/Eventing/Event.h>
@@ -20,6 +21,15 @@ namespace OvUI::Widgets::Layout
 	class GroupCollapsable : public Group
 	{
 	public:
+		/**
+		* Represents a clickable icon button drawn inside the collapsable header
+		*/
+		struct HeaderAction
+		{
+			uint32_t textureID;
+			std::function<void()> callback;
+		};
+
 		/**
 		* Constructor
 		* @param p_name
@@ -36,6 +46,7 @@ namespace OvUI::Widgets::Layout
 		bool reorderable = false;
 		bool canMoveUp = true;
 		bool canMoveDown = true;
+		std::vector<HeaderAction> actions;
 		OvTools::Eventing::Event<> CloseEvent;
 		OvTools::Eventing::Event<> OpenEvent;
 		OvTools::Eventing::Event<> MoveUpEvent;

Sources/OvUI/include/OvUI/Widgets/Layout/GroupCollapsable.h

@@ -7,6 +7,7 @@
 #include <imgui.h>
 #include <imgui_internal.h>
 
+#include "OvUI/Internal/TextureID.h"
 #include "OvUI/Widgets/Layout/GroupCollapsable.h"
 
 OvUI::Widgets::Layout::GroupCollapsable::GroupCollapsable(const std::string & p_name) :
@@ -22,7 +23,7 @@ void OvUI::Widgets::Layout::GroupCollapsable::_Draw_Impl()
 
 	EndDisableOverride(); // Early end disable override group so that children are not affected
 
-	if (reorderable)
+	if (reorderable || !actions.empty())
 	{
 		const ImVec2 headerMin = ImGui::GetItemRectMin();
 		const ImVec2 headerMax = ImGui::GetItemRectMax();
@@ -32,22 +33,40 @@ void OvUI::Widgets::Layout::GroupCollapsable::_Draw_Impl()
 
 		// Keep original vertical padding so arrow buttons fill the header height exactly
 		const float padY = ImGui::GetStyle().FramePadding.y;
-		ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2{0, padY});
+		ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2{padY, padY});
 		ImGui::PushStyleColor(ImGuiCol_Button, ImVec4{0, 0, 0, 0});
 		ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImGui::GetStyleColorVec4(ImGuiCol_HeaderHovered));
 		ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImGui::GetStyleColorVec4(ImGuiCol_HeaderActive));
 
-		ImGui::SetCursorScreenPos({rightEdge - bSize * 2.0f, headerMin.y});
-		if (!canMoveUp) ImGui::BeginDisabled();
-		if (ImGui::ArrowButton(("##mu" + m_widgetID).c_str(), ImGuiDir_Up))
-			MoveUpEvent.Invoke();
-		if (!canMoveUp) ImGui::EndDisabled();
+		if (reorderable)
+		{
+			ImGui::SetCursorScreenPos({rightEdge - bSize * 2.0f, headerMin.y});
+			if (!canMoveUp) ImGui::BeginDisabled();
+			if (ImGui::ArrowButton(("##mu" + m_widgetID).c_str(), ImGuiDir_Up))
+				MoveUpEvent.Invoke();
+			if (!canMoveUp) ImGui::EndDisabled();
 
-		ImGui::SetCursorScreenPos({rightEdge - bSize, headerMin.y});
-		if (!canMoveDown) ImGui::BeginDisabled();
-		if (ImGui::ArrowButton(("##md" + m_widgetID).c_str(), ImGuiDir_Down))
-			MoveDownEvent.Invoke();
-		if (!canMoveDown) ImGui::EndDisabled();
+			ImGui::SetCursorScreenPos({rightEdge - bSize, headerMin.y});
+			if (!canMoveDown) ImGui::BeginDisabled();
+			if (ImGui::ArrowButton(("##md" + m_widgetID).c_str(), ImGuiDir_Down))
+				MoveDownEvent.Invoke();
+			if (!canMoveDown) ImGui::EndDisabled();
+		}
+
+		const float actionsRight = rightEdge - (reorderable ? 2.0f * bSize : 0.0f);
+		for (int i = static_cast<int>(actions.size()) - 1; i >= 0; --i)
+		{
+			ImGui::SetCursorScreenPos({actionsRight - static_cast<float>(actions.size() - i) * bSize, headerMin.y});
+			Internal::TextureID texID;
+			texID.id = actions[i].textureID;
+			if (ImGui::ImageButtonEx(
+				ImGui::GetID(("##act" + std::to_string(i) + m_widgetID).c_str()),
+				texID.id,
+				{bSize - 2.0f * padY, bSize - 2.0f * padY},
+				{0.f, 1.f}, {1.f, 0.f},
+				{0, 0, 0, 0}, {1, 1, 1, 1}))
+				actions[i].callback();
+		}
 
 		ImGui::PopStyleColor(3);
 		ImGui::PopStyleVar();