src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditor-imgui.cpp

@@ -443,16 +443,6 @@ void TileSheetEditorImGui::drawPaletteMenu() noexcept {
 	if (ig::ComboBox("Palette", files, m_selectedPaletteIdx)) {
 		oxLogError(m_model.setPalette(files[m_selectedPaletteIdx]));
 	}
-	if (ig::DragDropTarget const dragDropTarget; dragDropTarget) {
-		auto const [ref, err] = ig::getDragDropPayload<studio::FileRef>("FileRef");
-		if (!err) {
-			auto const oldVal = m_selectedPaletteIdx;
-			std::ignore = ox::findIdx(files.begin(), files.end(), ref.path).moveTo(m_selectedPaletteIdx);
-			if (oldVal != m_selectedPaletteIdx) {
-				oxLogError(m_model.setPalette(files[m_selectedPaletteIdx]));
-			}
-		}
-	}
 	auto const pages = m_model.pal().pages.size();
 	if (pages > 1) {
 		ig::IndentStackItem	const indentStackItem{20};

src/olympic/studio/applib/src/projecttreemodel.cpp

@@ -4,7 +4,6 @@
 
 #include <imgui.h>
 
-#include <studio/dragdrop.hpp>
 #include <studio/imguiutil.hpp>
 
 #include "projectexplorer.hpp"
@@ -55,9 +54,8 @@ void ProjectTreeModel::draw(turbine::Context &tctx) const noexcept {
 				ImGui::EndPopup();
 			}
 			ImGui::TreePop();
-			std::ignore = ig::dragDropSource([this] {
+			ig::dragDropSource([this] {
 				ImGui::Text("%s", m_name.c_str());
-				return ig::setDragDropPayload("FileRef", FileRef{fullPath<ox::String>()});
 			});
 		}
 	}
@@ -82,4 +80,11 @@ void ProjectTreeModel::drawDirContextMenu() const noexcept {
     }
 }
 
+ox::BasicString<255> ProjectTreeModel::fullPath() const noexcept {
+	if (m_parent) {
+		return m_parent->fullPath() + "/" + m_name;
+	}
+	return {};
+}
+
 }

src/olympic/studio/applib/src/projecttreemodel.hpp

@@ -32,14 +32,8 @@ class ProjectTreeModel {
 	private:
 		void drawDirContextMenu() const noexcept;
 
-		template<typename Str = ox::BasicString<255>>
 		[[nodiscard]]
-		Str fullPath() const noexcept {
-			if (m_parent) {
-				return m_parent->fullPath<Str>() + "/" + m_name;
-			}
-			return {};
-		}
+		ox::BasicString<255> fullPath() const noexcept;
 
 };
 

src/olympic/studio/modlib/include/studio/dragdrop.hpp

@@ -1,22 +0,0 @@
-/*
- * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
- */
-
-#pragma once
-
-#include <ox/std/string.hpp>
-#include <ox/model/def.hpp>
-
-namespace studio {
-
-struct FileRef {
-	static constexpr auto TypeName = "net.drinkingtea.studio.FileRef";
-	static constexpr auto TypeVersion = 1;
-	ox::String path;
-};
-
-OX_MODEL_BEGIN(FileRef)
-	OX_MODEL_FIELD(path)
-OX_MODEL_END()
-
-}

src/olympic/studio/modlib/include/studio/imguiutil.hpp

@@ -63,7 +63,6 @@ auto dragDropSource(auto const&cb) noexcept {
 		if (ig::DragDropSource const tgt; tgt) [[unlikely]] {
 			return cb();
 		}
-		return ox::Error{};
 	} else {
 		if (ig::DragDropSource const tgt; tgt) [[unlikely]] {
 			cb();

src/olympic/studio/modlib/include/studio/studio.hpp

@@ -6,7 +6,6 @@
 
 #include <studio/configio.hpp>
 #include <studio/context.hpp>
-#include <studio/dragdrop.hpp>
 #include <studio/editor.hpp>
 #include <studio/filedialog.hpp>
 #include <studio/imguiutil.hpp>