move sprite_editor to editors/sprite

src/CMakeLists.txt

@@ -12,7 +12,7 @@ set(
   app/editor/master_editor.cc
   app/editor/overworld_editor.cc
   app/editor/screen_editor.cc
-  app/editor/sprite_editor.cc
+  app/editor/sprite/sprite_editor.cc
   app/editor/modules/music_editor.cc
   app/editor/modules/palette_editor.cc
   app/editor/code/assembly_editor.cc

src/app/editor/master_editor.cc

@@ -21,7 +21,7 @@
 #include "app/editor/modules/palette_editor.h"
 #include "app/editor/overworld_editor.h"
 #include "app/editor/screen_editor.h"
-#include "app/editor/sprite_editor.h"
+#include "app/editor/sprite/sprite_editor.h"
 #include "app/emu/emulator.h"
 #include "app/gfx/snes_palette.h"
 #include "app/gfx/snes_tile.h"

src/app/editor/master_editor.h

@@ -21,7 +21,7 @@
 #include "app/editor/modules/palette_editor.h"
 #include "app/editor/overworld_editor.h"
 #include "app/editor/screen_editor.h"
-#include "app/editor/sprite_editor.h"
+#include "app/editor/sprite/sprite_editor.h"
 #include "app/emu/emulator.h"
 #include "app/gfx/snes_palette.h"
 #include "app/gfx/snes_tile.h"

src/app/editor/modules/gfx_group_editor.cc

@@ -217,11 +217,8 @@ void DrawPaletteFromPaletteGroup(gfx::SnesPalette &palette) {
     ImGui::PushID(n);
     if ((n % 8) != 0) ImGui::SameLine(0.0f, ImGui::GetStyle().ItemSpacing.y);
 
-    auto popup_id = absl::StrCat("Palette", n);
-
     // Small icon of the color in the palette
-
+    if (gui::SnesColorButton(absl::StrCat("Palette", n), palette[n],
-    if (gui::SnesColorButton(popup_id, palette[n],
                              ImGuiColorEditFlags_NoAlpha |
                                  ImGuiColorEditFlags_NoPicker |
                                  ImGuiColorEditFlags_NoTooltip)) {