From 17a838206ba8736ca539c2e9e21ea19d9f0f4d40 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Wed, 18 Dec 2024 02:13:41 -0600 Subject: [PATCH] [studio] Fix build --- .../olympic/studio/modlib/include/studio/imguiutil.hpp | 8 ++++++-- .../src/olympic/studio/modlib/src/imguiutil.cpp | 9 +-------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/deps/nostalgia/src/olympic/studio/modlib/include/studio/imguiutil.hpp b/deps/nostalgia/src/olympic/studio/modlib/include/studio/imguiutil.hpp index ee3d1a0..7fca328 100644 --- a/deps/nostalgia/src/olympic/studio/modlib/include/studio/imguiutil.hpp +++ b/deps/nostalgia/src/olympic/studio/modlib/include/studio/imguiutil.hpp @@ -34,7 +34,11 @@ ox::Result getDragDropPayload(ox::CStringViewCR name) noexcept { static_cast(payload->DataSize)}); } -ox::Error setDragDropPayload(ox::CStringViewCR name, auto const&obj) noexcept; +ox::Error setDragDropPayload(ox::CStringViewCR name, auto const&obj) noexcept { + oxRequire(buff, ox::writeClaw(obj, ox::ClawFormat::Metal)); + ImGui::SetDragDropPayload(name.c_str(), buff.data(), buff.size()); + return {}; +} class DragDropSource { @@ -208,7 +212,7 @@ bool FileComboBox( bool ListBox( ox::CStringViewCR name, - std::function const&f, + std::function const&f, size_t strCnt, size_t &selIdx) noexcept; diff --git a/deps/nostalgia/src/olympic/studio/modlib/src/imguiutil.cpp b/deps/nostalgia/src/olympic/studio/modlib/src/imguiutil.cpp index 81101c3..7a1f9fa 100644 --- a/deps/nostalgia/src/olympic/studio/modlib/src/imguiutil.cpp +++ b/deps/nostalgia/src/olympic/studio/modlib/src/imguiutil.cpp @@ -10,13 +10,6 @@ namespace studio::ig { -ox::Error setDragDropPayload(ox::CStringViewCR name, auto const&obj) noexcept { - oxRequire(buff, ox::writeClaw(obj, ox::ClawFormat::Metal)); - ImGui::SetDragDropPayload(name.c_str(), buff.data(), buff.size()); - return {}; -} - - ChildStackItem::ChildStackItem(ox::CStringViewCR id, ImVec2 const&sz) noexcept { ImGui::BeginChild(id.c_str(), sz); } @@ -142,7 +135,7 @@ bool FileComboBox( bool ListBox( ox::CStringViewCR name, - std::function const&f, + std::function const&f, size_t strCnt, size_t &selIdx) noexcept { auto out = false;