More UI polishing and fix asset saving/reloading

1 files changed, 5 insertions, 9 deletions

diff --git a/core/src/Model/Template/Template_Main.cpp b/core/src/Model/Template/Template_Main.cpp
index 7dd5f87..8b659cf 100644
--- a/core/src/Model/Template/Template_Main.cpp
+++ b/core/src/Model/Template/Template_Main.cpp
@@ -25,8 +25,8 @@ Template::Kind Template::GetKind() const
 
 void TemplateAssetList::DiscoverFiles(const std::function<void(SavedAsset)>& callback) const
 {
-	auto& gs = GlobalStates::GetInstance();
-	DiscoverFilesByExtension(callback, gs.GetCurrentProject()->GetTemplatesDirectory(), ".cplt-template"sv);
+	auto dir = GetConnectedProject().GetTemplatesDirectory();
+	DiscoverFilesByExtension(callback, dir, ".cplt-template"sv);
 }
 
 std::string TemplateAssetList::RetrieveNameFromFile(const fs::path& file) const
@@ -46,12 +46,8 @@ uuids::uuid TemplateAssetList::RetrieveUuidFromFile(const fs::path& file) const
 
 fs::path TemplateAssetList::RetrievePathFromAsset(const SavedAsset& asset) const
 {
-	auto uuid = uuids::uuid_random_generator{}();
-	auto fileName = uuids::to_string(uuid);
-	fileName.append(".cplt-template");
-
-	auto& gs = GlobalStates::GetInstance();
-	return gs.GetCurrentProject()->GetTemplatePath(fileName);
+	auto fileName = uuids::to_string(asset.Uuid);
+	return GetConnectedProject().GetTemplatePath(fileName);
 }
 
 void TemplateAssetList::SaveEmptyInstance(const SavedAsset& asset) const
@@ -183,7 +179,7 @@ void TemplateAssetList::DrawBigIcon(ListState& state, const SavedAsset& asset) c
 void TemplateAssetList::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;
 	}