diff --git a/src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor-imgui.cpp b/src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor-imgui.cpp index 76665047..2abae5a0 100644 --- a/src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor-imgui.cpp +++ b/src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor-imgui.cpp @@ -68,12 +68,6 @@ void PaletteEditorImGui::drawColumn(ox::CStringView txt) noexcept { ImGui::Text("%s", txt.c_str()); } -void PaletteEditorImGui::drawColumn(uint64_t i) noexcept { - ox::Array numStr; - ox::itoa(i, numStr.data()); - drawColumn(numStr.data()); -} - void PaletteEditorImGui::drawColorsEditor() noexcept { constexpr auto tableFlags = ImGuiTableFlags_RowBg; auto const colorsSz = ImGui::GetContentRegionAvail(); diff --git a/src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor-imgui.hpp b/src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor-imgui.hpp index d8d5982f..1a828efe 100644 --- a/src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor-imgui.hpp +++ b/src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor-imgui.hpp @@ -33,7 +33,9 @@ class PaletteEditorImGui: public studio::Editor { private: static void drawColumn(ox::CStringView txt) noexcept; - static void drawColumn(uint64_t i) noexcept; + static void drawColumn(ox::Integer_c auto i) noexcept { + drawColumn(ox::itoa(i)); + } void drawColorsEditor() noexcept; diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditor-imgui.cpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditor-imgui.cpp index 6f68e705..1a8546fd 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditor-imgui.cpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditor-imgui.cpp @@ -8,8 +8,6 @@ #include #include -#include "ox/std/buffer.hpp" -#include "ox/std/cstrops.hpp" #include "tilesheeteditor-imgui.hpp" namespace nostalgia::core { @@ -412,14 +410,13 @@ void TileSheetEditorImGui::drawPaletteSelector() noexcept { auto const pages = m_model.pal().pages.size(); if (pages > 1) { ImGui::Indent(20); - ox::Array numStr; - ox::itoa(m_model.palettePage() + 1, numStr.data()); + auto numStr = ox::itoa(m_model.palettePage() + 1); ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x - comboWidthSub); - if (ImGui::BeginCombo("Page", numStr.data(), 0)) { + if (ImGui::BeginCombo("Page", numStr.c_str(), 0)) { for (auto n = 0u; n < pages; ++n) { auto const selected = (m_model.palettePage() == n); - ox::itoa(n + 1, numStr.data()); - if (ImGui::Selectable(numStr.data(), selected) && m_model.palettePage() != n) { + numStr = ox::itoa(n + 1); + if (ImGui::Selectable(numStr.c_str(), selected) && m_model.palettePage() != n) { m_model.setPalettePage(n); } if (selected) { @@ -442,9 +439,7 @@ void TileSheetEditorImGui::drawPaletteSelector() noexcept { ImGui::PushID(static_cast(i)); // Column: color idx ImGui::TableNextColumn(); - ox::IString<8> label; - ox::CharBuffWriter w(label.data(), label.bytes()); - std::ignore = ox::writeItoa(i + 1, w); + auto const label = ox::itoa(i + 1); auto const rowSelected = i == m_view.palIdx(); if (ImGui::Selectable(label.c_str(), rowSelected, ImGuiSelectableFlags_SpanAllColumns)) { m_view.setPalIdx(i);