Merge commit 'c42adc290cd8a27d01bb6d9877032dd2c963a4b7'

deps/nostalgia/src/olympic/studio/applib/src/projectexplorer.cpp

@@ -47,17 +47,17 @@ void ProjectExplorer::fileContextMenu(ox::StringViewCR path) const noexcept {
 }
 
 void ProjectExplorer::dirContextMenu(ox::StringViewCR path) const noexcept {
-    if (ImGui::BeginPopupContextItem("DirMenu", ImGuiPopupFlags_MouseButtonRight)) {
-        if (ImGui::MenuItem("Add Item")) {
-            addItem.emit(path);
-        }
-        if (ImGui::MenuItem("Add Directory")) {
-            addDir.emit(path);
-        }
-		if (ImGui::MenuItem("Delete")) {
+	if (ImGui::BeginPopupContextItem("DirMenu", ImGuiPopupFlags_MouseButtonRight)) {
+		if (ImGui::MenuItem("Add Item")) {
+			addItem.emit(path);
+		}
+		if (ImGui::MenuItem("Add Directory")) {
+			addDir.emit(path);
+		}
+		if (path.len() && ImGui::MenuItem("Delete")) {
 			deleteItem.emit(path);
 		}
-        ImGui::EndPopup();
+		ImGui::EndPopup();
     }
 }
 

deps/nostalgia/src/olympic/studio/applib/src/renamefile.cpp

@@ -41,18 +41,35 @@ void RenameFile::draw(StudioContext &ctx) noexcept {
 		case Stage::Opening:
 			ImGui::OpenPopup(title().c_str());
 			m_open = true;
+			m_fileExists = false;
 			m_stage = Stage::Open;
 		[[fallthrough]];
 		case Stage::Open:
 			setSize({250, 0});
-			drawWindow(ctx.tctx, m_open, [this] {
+			drawWindow(ctx.tctx, m_open, [this, &ctx] {
 				if (ImGui::IsWindowAppearing()) {
 					ImGui::SetKeyboardFocusHere();
 				}
-				ig::InputText("Name", m_name);
-				ImGui::Text("%s%s", m_path.c_str(), m_name.c_str());
-				if (ig::PopupControlsOkCancel(m_open) == ig::PopupResponse::OK) {
-					moveFile.emit(m_oldPath, m_path + m_name);
+				m_fileExists = !ig::InputText("Name", m_name) && m_fileExists;
+				auto const nameInputFocused = ImGui::IsItemFocused();
+				if (m_fileExists) {
+					ImGui::Text("File %s already exists.", m_name.c_str());
+				} else {
+					ImGui::Text("%s%s", m_path.c_str(), m_name.c_str());
+				}
+				bool b{};
+				auto const response = ig::PopupControlsOkCancel(b);
+				if (response == ig::PopupResponse::OK ||
+				    (nameInputFocused && ImGui::IsKeyPressed(ImGuiKey_Enter))) {
+					auto const newPath = m_path + m_name;
+					if (!ctx.project->exists(newPath)) {
+						moveFile.emit(m_oldPath, newPath);
+						close();
+					} else {
+						m_open = true;
+						m_fileExists = true;
+					}
+				} else if (response == ig::PopupResponse::Cancel) {
 					close();
 				}
 			});

deps/nostalgia/src/olympic/studio/applib/src/renamefile.hpp

@@ -21,6 +21,7 @@ class RenameFile: public Popup {
 		ox::String m_oldPath;
 		ox::String m_path;
 		ox::IString<255> m_name;
+		bool m_fileExists{};
 		bool m_open{};
 
 	public:

deps/nostalgia/src/olympic/studio/applib/src/studioapp.cpp

@@ -349,10 +349,6 @@ void StudioUI::handleKeyInput() noexcept {
 						m_activeEditorUpdatePending = m_activeEditor;
 					}
 				}
-				if (ImGui::IsKeyPressed(ImGuiKey_0)) {
-					m_activeEditor = m_editors[10 < m_editors.size() ? 10 : range].get();
-					m_activeEditorUpdatePending = m_activeEditor;
-				}
 			}
 		}
 	}
@@ -396,6 +392,18 @@ ox::Error StudioUI::handleMoveFile(ox::StringViewCR oldPath, ox::StringViewCR ne
 	return m_projectExplorer.refreshProjectTreeModel();
 }
 
+ox::Error StudioUI::handleDeleteFile(ox::StringViewCR path) noexcept {
+	for (size_t i{}; auto &e : m_editors) {
+		if (path == e->itemPath()) {
+			oxLogError(m_editors.erase(i).error);
+			oxLogError(closeFile(path));
+			break;
+		}
+		++i;
+	}
+	return m_projectExplorer.refreshProjectTreeModel();
+}
+
 ox::Error StudioUI::createOpenProject(ox::StringViewCR path) noexcept {
 	std::error_code ec;
 	std::filesystem::create_directories(toStdStringView(path), ec);
@@ -416,7 +424,7 @@ ox::Error StudioUI::openProjectPath(ox::StringParam path) noexcept {
 	m_newDirDialog.newDir.connect(m_sctx.project, &Project::mkdir);
 	m_project->dirAdded.connect(&m_projectExplorer, &ProjectExplorer::refreshProjectTreeModel);
 	m_project->fileAdded.connect(&m_projectExplorer, &ProjectExplorer::refreshProjectTreeModel);
-	m_project->fileDeleted.connect(&m_projectExplorer, &ProjectExplorer::refreshProjectTreeModel);
+	m_project->fileDeleted.connect(this, &StudioUI::handleDeleteFile);
 	m_project->fileMoved.connect(this, &StudioUI::handleMoveFile);
 	m_openFiles.clear();
 	m_editors.clear();
@@ -499,11 +507,15 @@ ox::Error StudioUI::queueFileMove(ox::StringParam src, ox::StringParam dst) noex
 
 void StudioUI::procFileMoves() noexcept {
 	for (auto const &m : m_queuedMoves) {
-		oxLogError(m_project->moveItem(m.a, m.b));
+		if (!m_project->exists(m.b)) {
+			oxLogError(m_project->moveItem(m.a, m.b));
+		}
 	}
 	m_queuedMoves.clear();
 	for (auto const &m : m_queuedDirMoves) {
-		oxLogError(m_project->moveDir(m.a, m.b));
+		if (!m_project->exists(m.b)) {
+			oxLogError(m_project->moveDir(m.a, m.b));
+		}
 	}
 	m_queuedDirMoves.clear();
 }

deps/nostalgia/src/olympic/studio/applib/src/studioapp.hpp

@@ -104,6 +104,8 @@ class StudioUI: public ox::SignalHandler {
 
 		ox::Error handleMoveFile(ox::StringViewCR oldPath, ox::StringViewCR newPath, ox::UUID const&id) noexcept;
 
+		ox::Error handleDeleteFile(ox::StringViewCR path) noexcept;
+
 		ox::Error createOpenProject(ox::StringViewCR path) noexcept;
 
 		ox::Error openProjectPath(ox::StringParam path) noexcept;