Merge commit 'c42adc290cd8a27d01bb6d9877032dd2c963a4b7'

src/olympic/studio/modlib/src/filetreemodel.cpp

@@ -88,7 +88,7 @@ FileTreeModel::FileTreeModel(
 void FileTreeModel::draw(turbine::Context &tctx) const noexcept {
 	constexpr auto dirFlags = ImGuiTreeNodeFlags_OpenOnArrow | ImGuiTreeNodeFlags_OpenOnDoubleClick;
 	auto const selected = m_explorer.selected(this) ? ImGuiTreeNodeFlags_Selected : 0;
-	if (!m_children.empty()) {
+	if (m_fileType == ox::FileType::Directory) {
 		auto const nodeOpen = ImGui::TreeNodeEx(m_name.c_str(), dirFlags | selected);
 		if (ImGui::IsItemActivated() || ImGui::IsItemClicked(1)) {
 			m_explorer.setSelectedNode(this);
@@ -104,7 +104,8 @@ void FileTreeModel::draw(turbine::Context &tctx) const noexcept {
 		if (ig::DragDropTarget const dragDropTarget; dragDropTarget) {
 			auto const [ref, err] = ig::getDragDropPayload<FileRef>("FileRef");
 			if (!err) {
-				auto const name = substr(ref.path, find(ref.path.rbegin(), ref.path.rend(), '/').offset() + 1);
+				auto const name = substr(
+					ref.path, find(ref.path.rbegin(), ref.path.rend(), '/').offset() + 1);
 				if (ref.isDir) {
 					m_explorer.dirMoved(ref.path, sfmt("{}/{}", m_fullPath, name));
 				} else {

src/olympic/studio/modlib/src/imguiutil.cpp

@@ -64,13 +64,11 @@ PopupResponse PopupControlsOkCancel(
 	ImGui::Separator();
 	ImGui::SetCursorPosX(popupWidth - 118);
 	if (ImGui::Button(ok.c_str(), btnSz)) {
-		ImGui::CloseCurrentPopup();
 		popupOpen = false;
 		out = PopupResponse::OK;
 	}
 	ImGui::SameLine();
 	if (ImGui::IsKeyDown(ImGuiKey_Escape) || ImGui::Button(cancel.c_str(), btnSz)) {
-		ImGui::CloseCurrentPopup();
 		popupOpen = false;
 		out = PopupResponse::Cancel;
 	}

src/olympic/studio/modlib/src/project.cpp

@@ -46,6 +46,13 @@ static ox::Result<ox::Vector<ox::String>> listAllRecursive(ox::FileSystem &fs, o
 	return std::move(out);
 }
 
+[[nodiscard]]
+static constexpr bool isParentOf(ox::StringViewCR parent, ox::StringViewCR child) noexcept {
+	if (endsWith(child, "/")) {
+		return beginsWith(child, parent);
+	}
+	return beginsWith(sfmt("{}/", child), parent);
+}
 
 Project::Project(keel::Context &ctx, ox::String path, ox::StringViewCR projectDataDir):
 	m_kctx(ctx),
@@ -99,6 +106,9 @@ ox::Error Project::moveItem(ox::StringViewCR src, ox::StringViewCR dest) noexcep
 }
 
 ox::Error Project::moveDir(ox::StringViewCR src, ox::StringViewCR dest) noexcept {
+	if (isParentOf(src, dest)) {
+		return ox::Error{1, "cannot move parent to a child directory"};
+	}
 	OX_REQUIRE(files, listAllRecursive(m_fs, src));
 	OX_RETURN_ERROR(m_fs.move(src, dest));
 	fileMoved.emit(src, dest, ox::UUID{});