More UI polishing and fix asset saving/reloading

2 files changed, 9 insertions, 9 deletions

diff --git a/core/src/Model/Workflow/Workflow.hpp b/core/src/Model/Workflow/Workflow.hpp
index 3dc6f38..9c809bf 100644
--- a/core/src/Model/Workflow/Workflow.hpp
+++ b/core/src/Model/Workflow/Workflow.hpp
@@ -283,6 +283,10 @@ private:
 	NameSelectionError mACNewNameError = NameSelectionError::Empty;
 
 public:
+	// Inherit constructors
+	using AssetListTyped::AssetListTyped;
+
+public:
 	virtual void DiscoverFiles(const std::function<void(SavedAsset)>& callback) const override;
 
 	virtual std::string RetrieveNameFromFile(const std::filesystem::path& file) const override;
diff --git a/core/src/Model/Workflow/Workflow_Main.cpp b/core/src/Model/Workflow/Workflow_Main.cpp
index adf944e..77b64d3 100644
--- a/core/src/Model/Workflow/Workflow_Main.cpp
+++ b/core/src/Model/Workflow/Workflow_Main.cpp
@@ -746,8 +746,8 @@ std::pair<std::unique_ptr<WorkflowNode>&, uint32_t> Workflow::AllocWorkflowStep(
 
 void WorkflowAssetList::DiscoverFiles(const std::function<void(SavedAsset)>& callback) const
 {
-	auto& gs = GlobalStates::GetInstance();
-	DiscoverFilesByExtension(callback, gs.GetCurrentProject()->GetWorkflowsDirectory(), ".cplt-workflow"sv);
+	auto dir = GetConnectedProject().GetWorkflowsDirectory();
+	DiscoverFilesByExtension(callback, dir, ".cplt-workflow"sv);
 }
 
 std::string WorkflowAssetList::RetrieveNameFromFile(const fs::path& file) const
@@ -767,12 +767,8 @@ uuids::uuid WorkflowAssetList::RetrieveUuidFromFile(const fs::path& file) const
 
 fs::path WorkflowAssetList::RetrievePathFromAsset(const SavedAsset& asset) const
 {
-	auto uuid = uuids::uuid_random_generator{}();
-	auto fileName = uuids::to_string(uuid);
-	fileName.append(".cplt-workflow");
-
-	auto& gs = GlobalStates::GetInstance();
-	return gs.GetCurrentProject()->GetTemplatePath(fileName);
+	auto fileName = uuids::to_string(asset.Uuid);
+	return GetConnectedProject().GetTemplatePath(fileName);
 }
 
 void WorkflowAssetList::SaveEmptyInstance(const SavedAsset& asset) const
@@ -875,7 +871,7 @@ void WorkflowAssetList::DrawBigIcon(ListState& state, const SavedAsset& asset) c
 void WorkflowAssetList::DrawDetailsTableRow(ListState& state, const SavedAsset& asset) const
 {
 	ImGui::TableNextColumn();
-	if (ImGui::Selectable(asset.Name.c_str(), state.SelectedAsset == &asset, ImGuiSelectableFlags_SpanAllColumns)) {
+	if (ImGui::Selectable(asset.Name.c_str(), state.SelectedAsset == &asset, ImGuiSelectableFlags_SpanAllColumns | ImGuiSelectableFlags_DontClosePopups)) {
 		state.SelectedAsset = &asset;
 	}
 }