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 43d1bb8..cddb95c 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,7 @@ ox::Result getDragDropPayload(ox::CStringView name) noexcept { static_cast(payload->DataSize)}); } -ox::Error setDragDropPayload(ox::CStringView name, auto const&obj) noexcept { +static 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 {}; @@ -104,7 +104,7 @@ inline auto dragDropTarget(auto const&cb) noexcept { class ChildStackItem { public: - explicit ChildStackItem(ox::CStringView id, ImVec2 const&sz = {}) noexcept; + explicit ChildStackItem(ox::CStringViewCR id, ImVec2 const&sz = {}) noexcept; ~ChildStackItem() noexcept; }; @@ -112,7 +112,7 @@ class IDStackItem { public: explicit IDStackItem(int id) noexcept; explicit IDStackItem(const char *id) noexcept; - explicit IDStackItem(ox::CStringView id) noexcept; + explicit IDStackItem(ox::CStringViewCR id) noexcept; ~IDStackItem() noexcept; }; @@ -126,7 +126,7 @@ class IndentStackItem { void centerNextWindow(turbine::Context &ctx) noexcept; -bool PushButton(ox::CStringView lbl, ImVec2 const&btnSz = BtnSz) noexcept; +bool PushButton(ox::CStringViewCR lbl, ImVec2 const&btnSz = BtnSz) noexcept; template struct TextInput { @@ -180,7 +180,7 @@ PopupResponse PopupControlsOkCancel(float popupWidth, bool &popupOpen); PopupResponse PopupControlsOkCancel(bool &popupOpen); [[nodiscard]] -bool BeginPopup(turbine::Context &ctx, ox::CStringView popupName, bool &show, ImVec2 const&sz = {285, 0}); +bool BeginPopup(turbine::Context &ctx, ox::CStringViewCR popupName, bool &show, ImVec2 const&sz = {285, 0}); /** * @@ -199,20 +199,20 @@ bool ComboBox(ox::CStringView lbl, ox::Span list, size_t &sele * @return true if new value selected, false otherwise */ bool ComboBox( - ox::CStringView lbl, + ox::CStringViewCR lbl, std::function const&f, size_t strCnt, size_t &selectedIdx) noexcept; bool FileComboBox( - ox::CStringView lbl, - studio::StudioContext &sctx, - ox::StringView fileExt, + ox::CStringViewCR lbl, + StudioContext &sctx, + ox::StringViewCR fileExt, size_t &selectedIdx) noexcept; bool ListBox( - ox::CStringView name, - std::function const&f, + ox::CStringViewCR name, + std::function const&f, size_t strCnt, size_t &selIdx) noexcept; @@ -223,7 +223,7 @@ bool ListBox( * @param selIdx * @return true if new value selected, false otherwise */ -bool ListBox(ox::CStringView name, ox::Span const&list, size_t &selIdx) noexcept; +bool ListBox(ox::CStringViewCR name, ox::Span const&list, size_t &selIdx) noexcept; class FilePicker { private: diff --git a/deps/nostalgia/src/olympic/studio/modlib/src/imguiutil.cpp b/deps/nostalgia/src/olympic/studio/modlib/src/imguiutil.cpp index 5b68721..199d598 100644 --- a/deps/nostalgia/src/olympic/studio/modlib/src/imguiutil.cpp +++ b/deps/nostalgia/src/olympic/studio/modlib/src/imguiutil.cpp @@ -10,7 +10,7 @@ namespace studio::ig { -ChildStackItem::ChildStackItem(ox::CStringView id, ImVec2 const&sz) noexcept { +ChildStackItem::ChildStackItem(ox::CStringViewCR id, ImVec2 const&sz) noexcept { ImGui::BeginChild(id.c_str(), sz); } @@ -26,7 +26,7 @@ IDStackItem::IDStackItem(const char *id) noexcept { ImGui::PushID(id); } -IDStackItem::IDStackItem(ox::CStringView id) noexcept: IDStackItem(id.c_str()) {} +IDStackItem::IDStackItem(ox::CStringViewCR id) noexcept: IDStackItem(id.c_str()) {} IDStackItem::~IDStackItem() noexcept { ImGui::PopID(); @@ -50,7 +50,7 @@ void centerNextWindow(turbine::Context &ctx) noexcept { ImGui::SetNextWindowPos(ImVec2(screenW / mod, screenH / mod), ImGuiCond_Always, ImVec2(0.5f, 0.5f)); } -bool PushButton(ox::CStringView lbl, ImVec2 const&btnSz) noexcept { +bool PushButton(ox::CStringViewCR lbl, ImVec2 const&btnSz) noexcept { return ImGui::Button(lbl.c_str(), btnSz); } @@ -77,7 +77,7 @@ PopupResponse PopupControlsOkCancel(bool &popupOpen) { return PopupControlsOkCancel(ImGui::GetContentRegionAvail().x + 17, popupOpen); } -bool BeginPopup(turbine::Context &ctx, ox::CStringView popupName, bool &show, ImVec2 const&sz) { +bool BeginPopup(turbine::Context &ctx, ox::CStringViewCR popupName, bool &show, ImVec2 const&sz) { constexpr auto modalFlags = ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize; centerNextWindow(ctx); ImGui::OpenPopup(popupName.c_str()); @@ -105,7 +105,7 @@ bool ComboBox( } bool ComboBox( - ox::CStringView lbl, + ox::CStringViewCR lbl, std::function const&f, size_t strCnt, size_t &selectedIdx) noexcept { @@ -125,17 +125,17 @@ bool ComboBox( } bool FileComboBox( - ox::CStringView lbl, + ox::CStringViewCR lbl, StudioContext &sctx, - ox::StringView fileExt, + ox::StringViewCR fileExt, size_t &selectedIdx) noexcept { auto const&list = sctx.project->fileList(fileExt); return ComboBox(lbl, list, selectedIdx); } bool ListBox( - ox::CStringView name, - std::function const&f, + ox::CStringViewCR name, + std::function const&f, size_t strCnt, size_t &selIdx) noexcept { auto out = false; @@ -155,7 +155,7 @@ bool ListBox( return out; } -bool ListBox(ox::CStringView name, ox::Span const&list, size_t &selIdx) noexcept { +bool ListBox(ox::CStringViewCR name, ox::Span const&list, size_t &selIdx) noexcept { return ListBox(name, [list](size_t i) -> ox::CStringView { return list[i]; }, list.size(), selIdx);