refactor(gui): reorganize GUI includes and introduce new components

- Updated include paths for various GUI-related headers to improve organization and clarity.
- Introduced new components for better modularity, including PaletteEditorWidget and EditorCardManager.
- Refactored existing code to utilize the new components, ensuring consistency across the GUI subsystem.

Benefits:
- Enhances maintainability and readability of the GUI code.
- Facilitates future enhancements and optimizations within the GUI subsystem.

src/app/editor/agent/agent_chat_history_popup.cc

@@ -6,8 +6,8 @@
 #include "absl/time/time.h"
 #include "app/editor/agent/agent_ui_theme.h"
 #include "app/editor/system/toast_manager.h"
-#include "app/gui/icons.h"
-#include "app/gui/style.h"
+#include "app/gui/core/icons.h"
+#include "app/gui/core/style.h"
 #include "imgui/imgui.h"
 #include "imgui/misc/cpp/imgui_stdlib.h"
 

src/app/editor/agent/agent_chat_widget.cc

@@ -24,7 +24,7 @@
 #include "app/editor/agent/agent_chat_history_popup.h"
 #include "app/editor/system/proposal_drawer.h"
 #include "app/editor/system/toast_manager.h"
-#include "app/gui/icons.h"
+#include "app/gui/core/icons.h"
 #include "app/rom.h"
 #include "imgui/imgui.h"
 #include "util/file_util.h"

src/app/editor/agent/agent_chat_widget.h

@@ -10,7 +10,7 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/time/time.h"
-#include "app/gui/modules/text_editor.h"
+#include "app/gui/widgets/text_editor.h"
 #include "cli/service/agent/conversational_agent_service.h"
 #include "cli/service/agent/advanced_routing.h"
 #include "cli/service/agent/agent_pretraining.h"

src/app/editor/agent/agent_editor.cc

@@ -12,7 +12,7 @@
 #include "app/editor/agent/agent_collaboration_coordinator.h"
 #include "app/editor/system/proposal_drawer.h"
 #include "app/editor/system/toast_manager.h"
-#include "app/gui/icons.h"
+#include "app/gui/core/icons.h"
 #include "app/rom.h"
 #include "util/file_util.h"
 #include "util/platform_paths.h"

src/app/editor/agent/agent_editor.h

@@ -10,7 +10,7 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "app/editor/editor.h"
-#include "app/gui/modules/text_editor.h"
+#include "app/gui/widgets/text_editor.h"
 #include "cli/service/agent/conversational_agent_service.h"
 
 namespace yaze {

src/app/editor/agent/agent_ui_theme.cc

@@ -1,7 +1,7 @@
 #include "app/editor/agent/agent_ui_theme.h"
 
-#include "app/gui/theme_manager.h"
-#include "app/gui/color.h"
+#include "app/gui/core/theme_manager.h"
+#include "app/gui/core/color.h"
 #include "imgui/imgui.h"
 
 namespace yaze {

src/app/editor/agent/agent_ui_theme.h

@@ -2,8 +2,8 @@
 #define YAZE_APP_EDITOR_AGENT_AGENT_UI_THEME_H
 
 #include "imgui/imgui.h"
-#include "app/gui/theme_manager.h"
-#include "app/gui/color.h"
+#include "app/gui/core/theme_manager.h"
+#include "app/gui/core/color.h"
 
 namespace yaze {
 namespace editor {

src/app/editor/code/assembly_editor.cc

@@ -7,9 +7,9 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/match.h"
 #include "util/file_util.h"
-#include "app/gui/icons.h"
-#include "app/gui/ui_helpers.h"
-#include "app/gui/modules/text_editor.h"
+#include "app/gui/core/icons.h"
+#include "app/gui/core/ui_helpers.h"
+#include "app/gui/widgets/text_editor.h"
 
 namespace yaze::editor {
 

src/app/editor/code/assembly_editor.h

@@ -2,12 +2,14 @@
 #define YAZE_APP_EDITOR_ASSEMBLY_EDITOR_H
 
 #include <string>
+#include <vector>
 
+#include "absl/container/flat_hash_map.h"
 #include "app/editor/editor.h"
-#include "app/gui/modules/text_editor.h"
-#include "app/gui/editor_layout.h"
-#include "app/gui/editor_card_manager.h"
-#include "app/gui/style.h"
+#include "app/gui/widgets/text_editor.h"
+#include "app/gui/app/editor_layout.h"
+#include "app/gui/app/editor_card_manager.h"
+#include "app/gui/core/style.h"
 #include "app/rom.h"
 
 namespace yaze {

src/app/editor/code/memory_editor.cc

@@ -1,8 +1,8 @@
 #include "app/editor/code/memory_editor.h"
 
 #include "absl/strings/str_format.h"
-#include "app/gui/icons.h"
-#include "app/gui/style.h"
+#include "app/gui/core/icons.h"
+#include "app/gui/core/style.h"
 #include "imgui/imgui.h"
 
 namespace yaze {

src/app/editor/code/memory_editor.h

@@ -2,7 +2,9 @@
 #define YAZE_APP_EDITOR_CODE_MEMORY_EDITOR_H
 
 #include "util/file_util.h"
-#include "app/gui/input.h"
+#include "absl/container/flat_hash_map.h"
+#include "app/editor/editor.h"
+#include "app/gui/core/input.h"
 #include "app/rom.h"
 #include "app/snes.h"
 #include "imgui/imgui.h"

src/app/editor/code/project_file_editor.cc

@@ -8,7 +8,7 @@
 #include "absl/strings/str_split.h"
 #include "util/file_util.h"
 #include "app/editor/system/toast_manager.h"
-#include "app/gui/icons.h"
+#include "app/gui/core/icons.h"
 #include "imgui/imgui.h"
 
 namespace yaze {

src/app/editor/code/project_file_editor.h

@@ -5,7 +5,7 @@
 
 #include "absl/status/status.h"
 #include "app/core/project.h"
-#include "app/gui/modules/text_editor.h"
+#include "app/gui/widgets/text_editor.h"
 
 namespace yaze {
 namespace editor {

src/app/editor/dungeon/dungeon_canvas_viewer.cc

@@ -3,7 +3,7 @@
 #include "absl/strings/str_format.h"
 #include "app/gfx/resource/arena.h"
 #include "app/gfx/types/snes_palette.h"
-#include "app/gui/input.h"
+#include "app/gui/core/input.h"
 #include "app/rom.h"
 #include "zelda3/dungeon/room.h"
 #include "zelda3/sprite/sprite.h"

src/app/editor/dungeon/dungeon_canvas_viewer.h

@@ -3,7 +3,7 @@
 
 #include <map>
 
-#include "app/gui/canvas.h"
+#include "app/gui/canvas/canvas.h"
 #include "app/rom.h"
 #include "zelda3/dungeon/room.h"
 #include "app/gfx/types/snes_palette.h"

src/app/editor/dungeon/dungeon_editor_v2.cc

@@ -8,8 +8,8 @@
 #include "app/gfx/util/palette_manager.h"
 #include "app/gfx/types/snes_palette.h"
 #include "zelda3/dungeon/room.h"
-#include "app/gui/icons.h"
-#include "app/gui/input.h"
+#include "app/gui/core/icons.h"
+#include "app/gui/core/input.h"
 #include "imgui/imgui.h"
 #include "util/log.h"
 

src/app/editor/dungeon/dungeon_editor_v2.h

@@ -14,10 +14,10 @@
 #include "dungeon_object_selector.h"
 #include "dungeon_room_loader.h"
 #include "object_editor_card.h"
-#include "app/gui/editor_card_manager.h"
+#include "app/gui/app/editor_card_manager.h"
 #include "zelda3/dungeon/room.h"
 #include "zelda3/dungeon/room_entrance.h"
-#include "app/gui/editor_layout.h"
+#include "app/gui/app/editor_layout.h"
 #include "app/gui/widgets/dungeon_object_emulator_preview.h"
 #include "app/gui/widgets/palette_editor_widget.h"
 #include "imgui/imgui.h"

src/app/editor/dungeon/dungeon_object_interaction.h

@@ -5,7 +5,7 @@
 #include <functional>
 
 #include "imgui/imgui.h"
-#include "app/gui/canvas.h"
+#include "app/gui/canvas/canvas.h"
 #include "zelda3/dungeon/room.h"
 #include "zelda3/dungeon/room_object.h"
 

src/app/editor/dungeon/dungeon_object_selector.cc

@@ -7,8 +7,8 @@
 #include "app/core/window.h"
 #include "app/gfx/resource/arena.h"
 #include "app/gfx/types/snes_palette.h"
-#include "app/gui/canvas.h"
-#include "app/gui/modules/asset_browser.h"
+#include "app/gui/canvas/canvas.h"
+#include "app/gui/widgets/asset_browser.h"
 #include "app/rom.h"
 #include "zelda3/dungeon/room.h"
 #include "zelda3/dungeon/dungeon_editor_system.h"

src/app/editor/dungeon/dungeon_object_selector.h

@@ -1,7 +1,7 @@
 #ifndef YAZE_APP_EDITOR_DUNGEON_DUNGEON_OBJECT_SELECTOR_H
 #define YAZE_APP_EDITOR_DUNGEON_DUNGEON_OBJECT_SELECTOR_H
 
-#include "app/gui/canvas.h"
+#include "app/gui/canvas/canvas.h"
 #include "app/rom.h"
 // object_renderer.h removed - using ObjectDrawer for production rendering
 #include "zelda3/dungeon/dungeon_object_editor.h"

src/app/editor/dungeon/dungeon_room_selector.cc

@@ -1,6 +1,6 @@
 #include "dungeon_room_selector.h"
 
-#include "app/gui/input.h"
+#include "app/gui/core/input.h"
 #include "zelda3/dungeon/room.h"
 #include "zelda3/dungeon/room_entrance.h"
 #include "imgui/imgui.h"

src/app/editor/dungeon/dungeon_toolset.cc

@@ -3,7 +3,7 @@
 #include <algorithm>
 #include <array>
 
-#include "app/gui/icons.h"
+#include "app/gui/core/icons.h"
 #include "imgui/imgui.h"
 
 namespace yaze::editor {

src/app/editor/dungeon/object_editor_card.cc

@@ -2,8 +2,8 @@
 
 #include "absl/strings/str_format.h"
 #include "app/gfx/backend/irenderer.h"
-#include "app/gui/icons.h"
-#include "app/gui/ui_helpers.h"
+#include "app/gui/core/icons.h"
+#include "app/gui/core/ui_helpers.h"
 #include "imgui/imgui.h"
 
 namespace yaze::editor {

src/app/editor/dungeon/object_editor_card.h

@@ -6,9 +6,9 @@
 
 #include "app/editor/dungeon/dungeon_canvas_viewer.h"
 #include "app/gfx/backend/irenderer.h"
-#include "app/gui/canvas.h"
+#include "app/gui/canvas/canvas.h"
 #include "app/editor/dungeon/dungeon_object_selector.h"
-#include "app/gui/editor_layout.h"
+#include "app/gui/app/editor_layout.h"
 #include "app/gui/widgets/dungeon_object_emulator_preview.h"
 #include "app/rom.h"
 #include "zelda3/dungeon/room_object.h"

src/app/editor/editor_manager.cc

@@ -13,7 +13,7 @@
 #include "app/core/features.h"
 #include "app/core/timing.h"
 #include "util/file_util.h"
-#include "app/gui/widgets/widget_id_registry.h"
+#include "app/gui/automation/widget_id_registry.h"
 #include "imgui/imgui.h"
 #include "util/log.h"
 #include "util/platform_paths.h"
@@ -30,11 +30,11 @@
 #include "app/emu/emulator.h"
 #include "app/gfx/resource/arena.h"
 #include "app/gfx/debug/performance/performance_profiler.h"
-#include "app/gui/background_renderer.h"
-#include "app/gui/icons.h"
-#include "app/gui/input.h"
-#include "app/gui/style.h"
-#include "app/gui/theme_manager.h"
+#include "app/gui/app/background_renderer.h"
+#include "app/gui/core/icons.h"
+#include "app/gui/core/input.h"
+#include "app/gui/core/style.h"
+#include "app/gui/core/theme_manager.h"
 #include "app/rom.h"
 #include "app/test/test_manager.h"
 #include "zelda3/overworld/overworld_map.h"

src/app/editor/graphics/gfx_group_editor.cc

@@ -4,9 +4,9 @@
 #include "absl/strings/str_cat.h"
 #include "app/gfx/resource/arena.h"
 #include "app/gfx/types/snes_palette.h"
-#include "app/gui/canvas.h"
-#include "app/gui/color.h"
-#include "app/gui/input.h"
+#include "app/gui/canvas/canvas.h"
+#include "app/gui/core/color.h"
+#include "app/gui/core/input.h"
 #include "app/rom.h"
 #include "imgui/imgui.h"
 

src/app/editor/graphics/gfx_group_editor.h

@@ -3,7 +3,7 @@
 
 #include "absl/status/status.h"
 #include "app/gfx/types/snes_palette.h"
-#include "app/gui/canvas.h"
+#include "app/gui/canvas/canvas.h"
 #include "app/rom.h"
 
 namespace yaze {

src/app/editor/graphics/graphics_editor.cc

@@ -5,7 +5,7 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
-#include "app/gui/ui_helpers.h"
+#include "app/gui/core/ui_helpers.h"
 #include "util/file_util.h"
 #include "app/core/window.h"
 #include "app/gfx/resource/arena.h"
@@ -14,12 +14,12 @@
 #include "app/gfx/util/scad_format.h"
 #include "app/gfx/types/snes_palette.h"
 #include "app/gfx/types/snes_tile.h"
-#include "app/gui/canvas.h"
-#include "app/gui/color.h"
-#include "app/gui/icons.h"
-#include "app/gui/input.h"
-#include "app/gui/modules/asset_browser.h"
-#include "app/gui/style.h"
+#include "app/gui/canvas/canvas.h"
+#include "app/gui/core/color.h"
+#include "app/gui/core/icons.h"
+#include "app/gui/core/input.h"
+#include "app/gui/widgets/asset_browser.h"
+#include "app/gui/core/style.h"
 #include "app/rom.h"
 #include "app/gfx/debug/performance/performance_profiler.h"
 #include "imgui/imgui.h"

src/app/editor/graphics/graphics_editor.h

@@ -7,11 +7,11 @@
 #include "app/editor/editor.h"
 #include "app/editor/palette/palette_editor.h"
 #include "app/gfx/core/bitmap.h"
-#include "app/gui/editor_card_manager.h"
+#include "app/gui/app/editor_card_manager.h"
 #include "app/gfx/types/snes_tile.h"
-#include "app/gui/canvas.h"
-#include "app/gui/editor_layout.h"
-#include "app/gui/modules/asset_browser.h"
+#include "app/gui/canvas/canvas.h"
+#include "app/gui/app/editor_layout.h"
+#include "app/gui/widgets/asset_browser.h"
 #include "app/rom.h"
 #include "zelda3/overworld/overworld.h"
 #include "imgui/imgui.h"

src/app/editor/graphics/screen_editor.cc

@@ -13,11 +13,11 @@
 #include "app/gfx/core/bitmap.h"
 #include "app/gfx/debug/performance/performance_profiler.h"
 #include "app/gfx/types/snes_tile.h"
-#include "app/gui/canvas.h"
-#include "app/gui/color.h"
-#include "app/gui/icons.h"
-#include "app/gui/input.h"
-#include "app/gui/ui_helpers.h"
+#include "app/gui/canvas/canvas.h"
+#include "app/gui/core/color.h"
+#include "app/gui/core/icons.h"
+#include "app/gui/core/input.h"
+#include "app/gui/core/ui_helpers.h"
 #include "imgui/imgui.h"
 #include "util/hex.h"
 #include "util/macro.h"

src/app/editor/graphics/screen_editor.h

@@ -7,13 +7,13 @@
 #include "app/editor/editor.h"
 #include "app/gfx/core/bitmap.h"
 #include "app/gfx/types/snes_palette.h"
-#include "app/gui/editor_card_manager.h"
+#include "app/gui/app/editor_card_manager.h"
 #include "app/gfx/render/tilemap.h"
-#include "app/gui/canvas.h"
+#include "app/gui/canvas/canvas.h"
 #include "app/rom.h"
 #include "zelda3/screen/dungeon_map.h"
 #include "zelda3/screen/inventory.h"
-#include "app/gui/editor_layout.h"
+#include "app/gui/app/editor_layout.h"
 #include "imgui/imgui.h"
 
 namespace yaze {

src/app/editor/message/message_editor.cc

@@ -12,11 +12,11 @@
 #include "app/gfx/core/bitmap.h"
 #include "app/gfx/types/snes_palette.h"
 #include "app/gfx/types/snes_tile.h"
-#include "app/gui/canvas.h"
-#include "app/gui/style.h"
-#include "app/gui/icons.h"
+#include "app/gui/canvas/canvas.h"
+#include "app/gui/core/style.h"
+#include "app/gui/core/icons.h"
 #include "app/rom.h"
-#include "app/gui/input.h"
+#include "app/gui/core/input.h"
 #include "imgui.h"
 #include "imgui/misc/cpp/imgui_stdlib.h"
 #include "util/hex.h"

src/app/editor/message/message_editor.h

@@ -9,11 +9,11 @@
 #include "app/editor/editor.h"
 #include "app/editor/message/message_data.h"
 #include "app/editor/message/message_preview.h"
-#include "app/gui/editor_card_manager.h"
-#include "app/gui/editor_layout.h"
+#include "app/gui/app/editor_card_manager.h"
+#include "app/gui/app/editor_layout.h"
 #include "app/gfx/core/bitmap.h"
-#include "app/gui/canvas.h"
-#include "app/gui/style.h"
+#include "app/gui/canvas/canvas.h"
+#include "app/gui/core/style.h"
 #include "app/rom.h"
 
 namespace yaze {

src/app/editor/music/music_editor.cc

@@ -4,8 +4,8 @@
 #include "app/gfx/debug/performance/performance_profiler.h"
 #include "app/editor/code/assembly_editor.h"
 #include "app/emu/emulator.h"
-#include "app/gui/icons.h"
-#include "app/gui/input.h"
+#include "app/gui/core/icons.h"
+#include "app/gui/core/input.h"
 #include "imgui/imgui.h"
 #include "util/log.h"
 

src/app/editor/music/music_editor.h

@@ -4,8 +4,8 @@
 #include "app/editor/code/assembly_editor.h"
 #include "app/editor/editor.h"
 #include "app/emu/audio/apu.h"
-#include "app/gui/editor_card_manager.h"
-#include "app/gui/editor_layout.h"
+#include "app/gui/app/editor_card_manager.h"
+#include "app/gui/app/editor_layout.h"
 #include "app/rom.h"
 #include "zelda3/music/tracker.h"
 #include "imgui/imgui.h"

src/app/editor/overworld/entity.cc

@@ -1,8 +1,8 @@
 #include "app/editor/overworld/entity.h"
 
-#include "app/gui/icons.h"
-#include "app/gui/input.h"
-#include "app/gui/style.h"
+#include "app/gui/core/icons.h"
+#include "app/gui/core/input.h"
+#include "app/gui/core/style.h"
 #include "util/hex.h"
 
 namespace yaze {

src/app/editor/overworld/map_properties.cc

@@ -3,10 +3,10 @@
 #include "app/gfx/debug/performance/performance_profiler.h"
 #include "app/editor/overworld/overworld_editor.h"
 #include "app/editor/overworld/ui_constants.h"
-#include "app/gui/canvas.h"
-#include "app/gui/color.h"
-#include "app/gui/icons.h"
-#include "app/gui/input.h"
+#include "app/gui/canvas/canvas.h"
+#include "app/gui/core/color.h"
+#include "app/gui/core/icons.h"
+#include "app/gui/core/input.h"
 #include "zelda3/overworld/overworld_map.h"
 #include "imgui/imgui.h"
 

src/app/editor/overworld/map_properties.h

@@ -5,7 +5,7 @@
 
 #include "zelda3/overworld/overworld.h"
 #include "app/rom.h"
-#include "app/gui/canvas.h"
+#include "app/gui/canvas/canvas.h"
 
 // Forward declaration
 namespace yaze {

src/app/editor/overworld/overworld_editor.cc

@@ -24,12 +24,12 @@
 #include "app/gfx/debug/performance/performance_profiler.h"
 #include "app/gfx/types/snes_palette.h"
 #include "app/gfx/render/tilemap.h"
-#include "app/gui/canvas.h"
+#include "app/gui/canvas/canvas.h"
 #include "app/gui/canvas/canvas_automation_api.h"
-#include "app/gui/editor_layout.h"
-#include "app/gui/icons.h"
-#include "app/gui/style.h"
-#include "app/gui/ui_helpers.h"
+#include "app/gui/app/editor_layout.h"
+#include "app/gui/core/icons.h"
+#include "app/gui/core/style.h"
+#include "app/gui/core/ui_helpers.h"
 #include "app/rom.h"
 #include "zelda3/common.h"
 #include "zelda3/overworld/overworld.h"

src/app/editor/overworld/overworld_editor.h

@@ -5,16 +5,16 @@
 #include "app/editor/editor.h"
 #include "app/editor/graphics/gfx_group_editor.h"
 #include "app/editor/palette/palette_editor.h"
-#include "app/gui/editor_card_manager.h"
+#include "app/gui/app/editor_card_manager.h"
 #include "app/editor/overworld/tile16_editor.h"
 #include "app/editor/overworld/map_properties.h"
 #include "app/editor/overworld/overworld_entity_renderer.h"
 #include "app/gfx/core/bitmap.h"
 #include "app/gfx/types/snes_palette.h"
 #include "app/gfx/render/tilemap.h"
-#include "app/gui/canvas.h"
+#include "app/gui/canvas/canvas.h"
 #include "app/gui/widgets/tile_selector_widget.h"
-#include "app/gui/input.h"
+#include "app/gui/core/input.h"
 #include "app/rom.h"
 #include "zelda3/overworld/overworld.h"
 #include "imgui/imgui.h"

src/app/editor/overworld/overworld_entity_renderer.cc

@@ -3,7 +3,7 @@
 #include "absl/strings/str_format.h"
 #include "app/core/features.h"
 #include "app/editor/overworld/entity.h"
-#include "app/gui/canvas.h"
+#include "app/gui/canvas/canvas.h"
 #include "zelda3/common.h"
 #include "util/hex.h"
 #include "imgui/imgui.h"

src/app/editor/overworld/overworld_entity_renderer.h

@@ -4,7 +4,7 @@
 #include <vector>
 
 #include "app/gfx/core/bitmap.h"
-#include "app/gui/canvas.h"
+#include "app/gui/canvas/canvas.h"
 #include "zelda3/common.h"
 #include "zelda3/overworld/overworld.h"
 #include "imgui/imgui.h"

src/app/editor/overworld/scratch_space.cc

@@ -21,10 +21,10 @@
 #include "app/gfx/debug/performance/performance_profiler.h"
 #include "app/gfx/types/snes_palette.h"
 #include "app/gfx/render/tilemap.h"
-#include "app/gui/canvas.h"
-#include "app/gui/icons.h"
-#include "app/gui/input.h"
-#include "app/gui/style.h"
+#include "app/gui/canvas/canvas.h"
+#include "app/gui/core/icons.h"
+#include "app/gui/core/input.h"
+#include "app/gui/core/style.h"
 #include "app/rom.h"
 #include "zelda3/common.h"
 #include "zelda3/overworld/overworld.h"

src/app/editor/overworld/tile16_editor.cc

@@ -8,9 +8,9 @@
 #include "app/gfx/backend/irenderer.h"
 #include "app/gfx/debug/performance/performance_profiler.h"
 #include "app/gfx/types/snes_palette.h"
-#include "app/gui/canvas.h"
-#include "app/gui/input.h"
-#include "app/gui/style.h"
+#include "app/gui/canvas/canvas.h"
+#include "app/gui/core/input.h"
+#include "app/gui/core/style.h"
 #include "app/rom.h"
 #include "zelda3/overworld/overworld.h"
 #include "imgui/imgui.h"

src/app/editor/overworld/tile16_editor.h

@@ -11,8 +11,8 @@
 #include "app/gfx/core/bitmap.h"
 #include "app/gfx/types/snes_palette.h"
 #include "app/gfx/types/snes_tile.h"
-#include "app/gui/canvas.h"
-#include "app/gui/input.h"
+#include "app/gui/canvas/canvas.h"
+#include "app/gui/core/input.h"
 #include "util/log.h"
 #include "app/rom.h"
 #include "imgui/imgui.h"

src/app/editor/palette/palette_editor.cc

@@ -5,10 +5,10 @@
 #include "app/gfx/util/palette_manager.h"
 #include "app/gfx/debug/performance/performance_profiler.h"
 #include "app/gfx/types/snes_palette.h"
-#include "app/gui/color.h"
-#include "app/gui/editor_card_manager.h"
-#include "app/gui/editor_layout.h"
-#include "app/gui/icons.h"
+#include "app/gui/core/color.h"
+#include "app/gui/app/editor_card_manager.h"
+#include "app/gui/app/editor_layout.h"
+#include "app/gui/core/icons.h"
 #include "imgui/imgui.h"
 
 namespace yaze {

src/app/editor/palette/palette_group_card.cc

@@ -5,10 +5,10 @@
 #include "absl/strings/str_format.h"
 #include "app/gfx/util/palette_manager.h"
 #include "app/gfx/types/snes_palette.h"
-#include "app/gui/color.h"
-#include "app/gui/icons.h"
-#include "app/gui/layout_helpers.h"
-#include "app/gui/themed_widgets.h"
+#include "app/gui/core/color.h"
+#include "app/gui/core/icons.h"
+#include "app/gui/core/layout_helpers.h"
+#include "app/gui/widgets/themed_widgets.h"
 #include "imgui/imgui.h"
 
 namespace yaze {

src/app/editor/palette/palette_group_card.h

@@ -11,7 +11,7 @@
 #include "absl/status/status.h"
 #include "app/gfx/types/snes_color.h"
 #include "app/gfx/types/snes_palette.h"
-#include "app/gui/editor_card_manager.h"
+#include "app/gui/app/editor_card_manager.h"
 #include "app/rom.h"
 #include "imgui/imgui.h"
 

src/app/editor/palette/palette_utility.cc

@@ -3,7 +3,7 @@
 #include "absl/strings/str_format.h"
 #include "app/editor/palette/palette_editor.h"
 #include "app/gfx/snes_palette.h"
-#include "app/gui/icons.h"
+#include "app/gui/core/icons.h"
 #include "app/rom.h"
 #include "imgui/imgui.h"
 

src/app/editor/palette/palette_utility.h

@@ -4,7 +4,7 @@
 #include <string>
 
 #include "app/gfx/snes_color.h"
-#include "app/gui/color.h"
+#include "app/gui/core/color.h"
 #include "imgui/imgui.h"
 
 namespace yaze {

src/app/editor/sprite/sprite_editor.cc

@@ -1,12 +1,12 @@
 #include "sprite_editor.h"
 
 #include "app/gfx/debug/performance/performance_profiler.h"
-#include "app/gui/ui_helpers.h"
+#include "app/gui/core/ui_helpers.h"
 #include "util/file_util.h"
 #include "app/editor/sprite/zsprite.h"
 #include "app/gfx/resource/arena.h"
-#include "app/gui/icons.h"
-#include "app/gui/input.h"
+#include "app/gui/core/icons.h"
+#include "app/gui/core/input.h"
 #include "zelda3/sprite/sprite.h"
 #include "util/hex.h"
 

src/app/editor/sprite/sprite_editor.h

@@ -7,9 +7,9 @@
 #include "absl/status/status.h"
 #include "app/editor/editor.h"
 #include "app/editor/sprite/zsprite.h"
-#include "app/gui/canvas.h"
-#include "app/gui/editor_card_manager.h"
-#include "app/gui/editor_layout.h"
+#include "app/gui/canvas/canvas.h"
+#include "app/gui/app/editor_card_manager.h"
+#include "app/gui/app/editor_layout.h"
 #include "app/rom.h"
 
 namespace yaze {

src/app/editor/system/command_manager.cc

@@ -2,7 +2,7 @@
 
 #include <fstream>
 
-#include "app/gui/input.h"
+#include "app/gui/core/input.h"
 #include "imgui/imgui.h"
 
 namespace yaze {

src/app/editor/system/popup_manager.cc

@@ -2,8 +2,8 @@
 
 #include "absl/strings/str_format.h"
 #include "app/editor/editor_manager.h"
-#include "app/gui/style.h"
-#include "app/gui/icons.h"
+#include "app/gui/core/style.h"
+#include "app/gui/core/icons.h"
 #include "util/hex.h"
 #include "imgui/misc/cpp/imgui_stdlib.h"
 

src/app/editor/system/proposal_drawer.cc

@@ -7,7 +7,7 @@
 #include "absl/strings/str_format.h"
 #include "absl/time/time.h"
 #include "imgui/imgui.h"
-#include "app/gui/icons.h"
+#include "app/gui/core/icons.h"
 #include "cli/service/rom/rom_sandbox_manager.h"
 
 // Policy evaluation support (optional, only in main yaze build)

src/app/editor/system/settings_editor.cc

@@ -2,11 +2,11 @@
 #include "app/editor/system/settings_editor.h"
 
 #include "absl/status/status.h"
-#include "app/gui/feature_flags_menu.h"
+#include "app/gui/app/feature_flags_menu.h"
 #include "app/gfx/debug/performance/performance_profiler.h"
-#include "app/gui/style.h"
-#include "app/gui/icons.h"
-#include "app/gui/theme_manager.h"
+#include "app/gui/core/style.h"
+#include "app/gui/core/icons.h"
+#include "app/gui/core/theme_manager.h"
 #include "imgui/imgui.h"
 #include "util/log.h"
 

src/app/editor/system/shortcut_manager.cc

@@ -3,7 +3,7 @@
 #include <algorithm>
 #include <string>
 
-#include "app/gui/input.h"
+#include "app/gui/core/input.h"
 #include "imgui/imgui.h"
 
 namespace yaze {

src/app/editor/system/user_settings.cc

@@ -4,7 +4,7 @@
 #include <sstream>
 
 #include "absl/strings/str_format.h"
-#include "app/gui/style.h"
+#include "app/gui/core/style.h"
 #include "imgui/imgui.h"
 #include "util/file_util.h"
 #include "util/log.h"

src/app/editor/ui/editor_selection_dialog.cc

@@ -6,8 +6,8 @@
 
 #include "absl/strings/str_cat.h"
 #include "imgui/imgui.h"
-#include "app/gui/icons.h"
-#include "app/gui/style.h"
+#include "app/gui/core/icons.h"
+#include "app/gui/core/style.h"
 #include "util/file_util.h"
 
 namespace yaze {

src/app/editor/ui/menu_builder.h

@@ -10,7 +10,9 @@
 #define IMGUI_DEFINE_MATH_OPERATORS
 #endif
 
-#include "app/gui/icons.h"
+#include "absl/container/flat_hash_map.h"
+#include "absl/strings/string_view.h"
+#include "app/gui/core/icons.h"
 #include "imgui/imgui.h"
 
 namespace yaze {

src/app/editor/ui/welcome_screen.cc

@@ -11,8 +11,8 @@
 #include "absl/time/time.h"
 #include "app/core/project.h"
 #include "app/core/timing.h"
-#include "app/gui/icons.h"
-#include "app/gui/theme_manager.h"
+#include "app/gui/core/icons.h"
+#include "app/gui/core/theme_manager.h"
 #include "imgui/imgui.h"
 #include "imgui/imgui_internal.h"
 #include "util/file_util.h"

src/app/editor/ui/workspace_manager.cc

@@ -1,6 +1,6 @@
 #include "app/editor/ui/workspace_manager.h"
 #include "app/editor/system/toast_manager.h"
-#include "app/gui/editor_card_manager.h"
+#include "app/gui/app/editor_card_manager.h"
 #include "app/rom.h"
 #include "absl/strings/str_format.h"
 #include "util/file_util.h"