From bdee9dd0c92865e0cec2f4bbf170959df282a930 Mon Sep 17 00:00:00 2001 From: rtk0c Date: Fri, 11 Jun 2021 22:19:23 -0700 Subject: More UI polishing and fix asset saving/reloading --- core/src/Model/Workflow/Workflow.hpp | 4 ++++ core/src/Model/Workflow/Workflow_Main.cpp | 14 +++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'core/src/Model/Workflow') 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 @@ -282,6 +282,10 @@ private: std::string mACNewName; NameSelectionError mACNewNameError = NameSelectionError::Empty; +public: + // Inherit constructors + using AssetListTyped::AssetListTyped; + public: virtual void DiscoverFiles(const std::function& callback) 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&, uint32_t> Workflow::AllocWorkflowStep( void WorkflowAssetList::DiscoverFiles(const std::function& 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; } } -- cgit v1.2.3-70-g09d2