From 64a6dbcfdb89a5f57d93d47a2be0c741dda4662d Mon Sep 17 00:00:00 2001 From: rtk0c Date: Sun, 15 Aug 2021 09:17:02 -0700 Subject: Fix issues and cleanup - Fix compile error on MSVC where is not included properly - Fix creating a workflow actually saves to the templates/ directory - Fix renaming assets are not saved to disk - TODO ser/deser still not working - Cleanup AssetList::* pure virtual setup (fewer splits) --- core/src/UI/UI_Workflows.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'core/src/UI/UI_Workflows.cpp') diff --git a/core/src/UI/UI_Workflows.cpp b/core/src/UI/UI_Workflows.cpp index e61e934..036e532 100644 --- a/core/src/UI/UI_Workflows.cpp +++ b/core/src/UI/UI_Workflows.cpp @@ -44,7 +44,7 @@ public: ImNodes::DestroyEditor(mContext); } - void Draw() + void Display() { ImNodes::SetCurrentEditor(mContext); ImNodes::Begin(""); @@ -235,6 +235,11 @@ public: ImNodes::End(); } + + void Close() + { + // TODO + } }; } // namespace @@ -248,6 +253,7 @@ void UI::WorkflowsTab() // Toolbar item: close if (ImGui::Button(ICON_FA_TIMES " " I18N_TEXT("Close", L10N_CLOSE), openWorkflow == nullptr)) { + openWorkflow->Close(); openWorkflow = nullptr; } @@ -257,7 +263,9 @@ void UI::WorkflowsTab() ImGui::OpenPopup(I18N_TEXT("Open asset", L10N_ASSET_OPEN_DIALOG_TITLE)); } if (ImGui::BeginPopupModal(I18N_TEXT("Open asset", L10N_ASSET_OPEN_DIALOG_TITLE), &openedDummy, ImGuiWindowFlags_AlwaysAutoResize)) { - if (ImGui::Button(I18N_TEXT("Open", L10N_OPEN), state.SelectedAsset == nullptr)) { + if (ImGui::Button(ICON_FA_FOLDER_OPEN " " I18N_TEXT("Open", L10N_OPEN), state.SelectedAsset == nullptr)) { + ImGui::CloseCurrentPopup(); + auto workflow = project.Workflows.Load(*state.SelectedAsset); openWorkflow = std::make_unique(std::move(workflow)); } @@ -280,6 +288,6 @@ void UI::WorkflowsTab() } if (openWorkflow) { - openWorkflow->Draw(); + openWorkflow->Display(); } } -- cgit v1.2.3-70-g09d2