diff --git a/src/nostalgia/modules/gfx/src/studio/paletteeditor/commands/movecolorcommand.cpp b/src/nostalgia/modules/gfx/src/studio/paletteeditor/commands/movecolorcommand.cpp index 6b56a984..ffd2dba1 100644 --- a/src/nostalgia/modules/gfx/src/studio/paletteeditor/commands/movecolorcommand.cpp +++ b/src/nostalgia/modules/gfx/src/studio/paletteeditor/commands/movecolorcommand.cpp @@ -10,11 +10,9 @@ namespace nostalgia::gfx { MoveColorCommand::MoveColorCommand( Palette &pal, - size_t const page, size_t const srcIdx, size_t const dstIdx) noexcept: m_pal(pal), - m_page(page), m_srcIdx(srcIdx), m_dstIdx(dstIdx) {} @@ -34,10 +32,10 @@ ox::Error MoveColorCommand::undo() noexcept { void MoveColorCommand::moveColor( size_t const srcIdx, size_t const dstIdx) noexcept { - { - auto const c = color(m_pal, m_page, srcIdx); - std::ignore = colors(m_pal, m_page).erase(srcIdx); - colors(m_pal, m_page).emplace(dstIdx, c); + for (size_t page{}; page < m_pal.pages.size(); ++page) { + auto const c = color(m_pal, page, srcIdx); + std::ignore = colors(m_pal, page).erase(srcIdx); + colors(m_pal, page).emplace(dstIdx, c); } { auto name = std::move(m_pal.colorNames[srcIdx]); diff --git a/src/nostalgia/modules/gfx/src/studio/paletteeditor/commands/movecolorcommand.hpp b/src/nostalgia/modules/gfx/src/studio/paletteeditor/commands/movecolorcommand.hpp index 7858ef6f..d1d8f21c 100644 --- a/src/nostalgia/modules/gfx/src/studio/paletteeditor/commands/movecolorcommand.hpp +++ b/src/nostalgia/modules/gfx/src/studio/paletteeditor/commands/movecolorcommand.hpp @@ -13,12 +13,11 @@ namespace nostalgia::gfx { class MoveColorCommand: public studio::UndoCommand { private: Palette &m_pal; - size_t const m_page = 0; std::size_t const m_srcIdx = 0; std::size_t const m_dstIdx = 0; public: - MoveColorCommand(Palette &pal, size_t page, size_t srcIdx, size_t dstIdx) noexcept; + MoveColorCommand(Palette &pal, size_t srcIdx, size_t dstIdx) noexcept; ~MoveColorCommand() noexcept override = default; diff --git a/src/nostalgia/modules/gfx/src/studio/paletteeditor/paletteeditor-imgui.cpp b/src/nostalgia/modules/gfx/src/studio/paletteeditor/paletteeditor-imgui.cpp index 8ca65c23..9cdf967c 100644 --- a/src/nostalgia/modules/gfx/src/studio/paletteeditor/paletteeditor-imgui.cpp +++ b/src/nostalgia/modules/gfx/src/studio/paletteeditor/paletteeditor-imgui.cpp @@ -175,7 +175,7 @@ void PaletteEditorImGui::drawColorsEditor() noexcept { if (ig::DragDropTarget const d; d) { auto const [src, err] = ig::getDragDropPayload(); if (!err) { - std::ignore = pushCommand(m_pal, m_page, src.i, i); + std::ignore = pushCommand(m_pal, src.i, i); } } ++i;