scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(editor): improve card visibility checks across various editors

Browse Source 
- Updated multiple editor components to check visibility flags before rendering cards, ensuring that only visible cards are displayed.
- Refactored card rendering logic in GraphicsEditor, ScreenEditor, MessageEditor, MusicEditor, SpriteEditor, and Emulator to enhance user experience and performance.
- Improved maintainability by centralizing visibility checks and ensuring consistent behavior across different editor types.

Benefits:
- Streamlines the rendering process, leading to a more efficient UI experience.
- Enhances code clarity and maintainability by standardizing visibility handling across editors.
This commit is contained in:
scawful
2025-10-15 14:55:49 -04:00
parent 71a573aee4
commit b8ccc2a6cd
10 changed files with 361 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/editor/editor_manager.cc
View File

@@ -1423,6 +1423,8 @@ absl::Status EditorManager::LoadAssets() {
emulator_.set_renderer(renderer_); emulator_.set_renderer(renderer_);
} }
// Initialize all editors - this registers their cards with EditorCardRegistry
// and sets up any editor-specific resources. Must be called before Load().
current_editor_set_->overworld_editor_.Initialize(); current_editor_set_->overworld_editor_.Initialize();
current_editor_set_->message_editor_.Initialize(); current_editor_set_->message_editor_.Initialize();
current_editor_set_->graphics_editor_.Initialize(); current_editor_set_->graphics_editor_.Initialize();
@@ -1430,6 +1432,8 @@ absl::Status EditorManager::LoadAssets() {
current_editor_set_->sprite_editor_.Initialize(); current_editor_set_->sprite_editor_.Initialize();
current_editor_set_->palette_editor_.Initialize(); current_editor_set_->palette_editor_.Initialize();
current_editor_set_->assembly_editor_.Initialize(); current_editor_set_->assembly_editor_.Initialize();
current_editor_set_->music_editor_.Initialize();
current_editor_set_->settings_editor_.Initialize(); // Initialize settings editor to register System cards
// Initialize the dungeon editor with the renderer // Initialize the dungeon editor with the renderer
current_editor_set_->dungeon_editor_.Initialize(renderer_, current_rom_); current_editor_set_->dungeon_editor_.Initialize(renderer_, current_rom_);
ASSIGN_OR_RETURN(*gfx::Arena::Get().mutable_gfx_sheets(), ASSIGN_OR_RETURN(*gfx::Arena::Get().mutable_gfx_sheets(),

50
src/app/editor/graphics/graphics_editor.cc
View File

@@ -114,30 +114,44 @@ absl::Status GraphicsEditor::Update() {
player_anims_card.SetDefaultSize(500, 600); player_anims_card.SetDefaultSize(500, 600);
prototype_card.SetDefaultSize(600, 500); prototype_card.SetDefaultSize(600, 500);
// Get visibility flags from card manager and pass to Begin() // Sheet Editor Card - Check visibility flag exists and is true before rendering
// Always call End() after Begin() - End() handles ImGui state safely bool* sheet_editor_visible = card_registry->GetVisibilityFlag("graphics.sheet_editor");
if (sheet_editor_card.Begin(card_registry->GetVisibilityFlag("graphics.sheet_editor"))) { if (sheet_editor_visible && *sheet_editor_visible) {
status_ = UpdateGfxEdit(); if (sheet_editor_card.Begin(sheet_editor_visible)) {
} status_ = UpdateGfxEdit();
sheet_editor_card.End();
if (sheet_browser_card.Begin(card_registry->GetVisibilityFlag("graphics.sheet_browser"))) {
if (asset_browser_.Initialized == false) {
asset_browser_.Initialize(gfx::Arena::Get().gfx_sheets());
} }
asset_browser_.Draw(gfx::Arena::Get().gfx_sheets()); sheet_editor_card.End();
} }
sheet_browser_card.End();
if (player_anims_card.Begin(card_registry->GetVisibilityFlag("graphics.player_animations"))) { // Sheet Browser Card - Check visibility flag exists and is true before rendering
status_ = UpdateLinkGfxView(); bool* sheet_browser_visible = card_registry->GetVisibilityFlag("graphics.sheet_browser");
if (sheet_browser_visible && *sheet_browser_visible) {
if (sheet_browser_card.Begin(sheet_browser_visible)) {
if (asset_browser_.Initialized == false) {
asset_browser_.Initialize(gfx::Arena::Get().gfx_sheets());
}
asset_browser_.Draw(gfx::Arena::Get().gfx_sheets());
}
sheet_browser_card.End();
} }
player_anims_card.End();
if (prototype_card.Begin(card_registry->GetVisibilityFlag("graphics.prototype_viewer"))) { // Player Animations Card - Check visibility flag exists and is true before rendering
status_ = UpdateScadView(); bool* player_anims_visible = card_registry->GetVisibilityFlag("graphics.player_animations");
if (player_anims_visible && *player_anims_visible) {
if (player_anims_card.Begin(player_anims_visible)) {
status_ = UpdateLinkGfxView();
}
player_anims_card.End();
}
// Prototype Viewer Card - Check visibility flag exists and is true before rendering
bool* prototype_visible = card_registry->GetVisibilityFlag("graphics.prototype_viewer");
if (prototype_visible && *prototype_visible) {
if (prototype_card.Begin(prototype_visible)) {
status_ = UpdateScadView();
}
prototype_card.End();
} }
prototype_card.End();
CLEAR_AND_RETURN_STATUS(status_) CLEAR_AND_RETURN_STATUS(status_)
return absl::OkStatus(); return absl::OkStatus();

52
src/app/editor/graphics/screen_editor.cc
View File

@@ -122,32 +122,50 @@ absl::Status ScreenEditor::Update() {
title_screen_card.SetDefaultSize(600, 500); title_screen_card.SetDefaultSize(600, 500);
naming_screen_card.SetDefaultSize(500, 400); naming_screen_card.SetDefaultSize(500, 400);
// Get visibility flags from card manager and pass to Begin() // Dungeon Maps Card - Check visibility flag exists and is true before rendering
// Always call End() after Begin() - End() handles ImGui state safely bool* dungeon_maps_visible = card_registry->GetVisibilityFlag("screen.dungeon_maps");
if (dungeon_maps_card.Begin(card_registry->GetVisibilityFlag("screen.dungeon_maps"))) { if (dungeon_maps_visible && *dungeon_maps_visible) {
DrawDungeonMapsEditor(); if (dungeon_maps_card.Begin(dungeon_maps_visible)) {
DrawDungeonMapsEditor();
}
dungeon_maps_card.End();
} }
dungeon_maps_card.End();
if (inventory_menu_card.Begin(card_registry->GetVisibilityFlag("screen.inventory_menu"))) { // Inventory Menu Card - Check visibility flag exists and is true before rendering
DrawInventoryMenuEditor(); bool* inventory_menu_visible = card_registry->GetVisibilityFlag("screen.inventory_menu");
if (inventory_menu_visible && *inventory_menu_visible) {
if (inventory_menu_card.Begin(inventory_menu_visible)) {
DrawInventoryMenuEditor();
}
inventory_menu_card.End();
} }
inventory_menu_card.End();
if (overworld_map_card.Begin(card_registry->GetVisibilityFlag("screen.overworld_map"))) { // Overworld Map Card - Check visibility flag exists and is true before rendering
DrawOverworldMapEditor(); bool* overworld_map_visible = card_registry->GetVisibilityFlag("screen.overworld_map");
if (overworld_map_visible && *overworld_map_visible) {
if (overworld_map_card.Begin(overworld_map_visible)) {
DrawOverworldMapEditor();
}
overworld_map_card.End();
} }
overworld_map_card.End();
if (title_screen_card.Begin(card_registry->GetVisibilityFlag("screen.title_screen"))) { // Title Screen Card - Check visibility flag exists and is true before rendering
DrawTitleScreenEditor(); bool* title_screen_visible = card_registry->GetVisibilityFlag("screen.title_screen");
if (title_screen_visible && *title_screen_visible) {
if (title_screen_card.Begin(title_screen_visible)) {
DrawTitleScreenEditor();
}
title_screen_card.End();
} }
title_screen_card.End();
if (naming_screen_card.Begin(card_registry->GetVisibilityFlag("screen.naming_screen"))) { // Naming Screen Card - Check visibility flag exists and is true before rendering
DrawNamingScreenEditor(); bool* naming_screen_visible = card_registry->GetVisibilityFlag("screen.naming_screen");
if (naming_screen_visible && *naming_screen_visible) {
if (naming_screen_card.Begin(naming_screen_visible)) {
DrawNamingScreenEditor();
}
naming_screen_card.End();
} }
naming_screen_card.End();
return status_; return status_;
} }

28
src/app/editor/message/message_editor.cc
View File

@@ -150,42 +150,46 @@ absl::Status MessageEditor::Update() {
auto* card_registry = dependencies_.card_registry; auto* card_registry = dependencies_.card_registry;
// Message List Card // Message List Card - Get visibility flag and pass to Begin() for proper X button
if (card_registry->IsCardVisible(MakeCardId("message.message_list"))) { bool* list_visible = card_registry->GetVisibilityFlag(MakeCardId("message.message_list"));
if (list_visible && *list_visible) {
static gui::EditorCard list_card("Message List", ICON_MD_LIST); static gui::EditorCard list_card("Message List", ICON_MD_LIST);
list_card.SetDefaultSize(400, 600); list_card.SetDefaultSize(400, 600);
if (list_card.Begin()) { if (list_card.Begin(list_visible)) {
DrawMessageList(); DrawMessageList();
} }
list_card.End(); list_card.End();
} }
// Message Editor Card // Message Editor Card - Get visibility flag and pass to Begin() for proper X button
if (card_registry->IsCardVisible(MakeCardId("message.message_editor"))) { bool* editor_visible = card_registry->GetVisibilityFlag(MakeCardId("message.message_editor"));
if (editor_visible && *editor_visible) {
static gui::EditorCard editor_card("Message Editor", ICON_MD_EDIT); static gui::EditorCard editor_card("Message Editor", ICON_MD_EDIT);
editor_card.SetDefaultSize(500, 600); editor_card.SetDefaultSize(500, 600);
if (editor_card.Begin()) { if (editor_card.Begin(editor_visible)) {
DrawCurrentMessage(); DrawCurrentMessage();
} }
editor_card.End(); editor_card.End();
} }
// Font Atlas Card // Font Atlas Card - Get visibility flag and pass to Begin() for proper X button
if (card_registry->IsCardVisible(MakeCardId("message.font_atlas"))) { bool* font_visible = card_registry->GetVisibilityFlag(MakeCardId("message.font_atlas"));
if (font_visible && *font_visible) {
static gui::EditorCard font_card("Font Atlas", ICON_MD_FONT_DOWNLOAD); static gui::EditorCard font_card("Font Atlas", ICON_MD_FONT_DOWNLOAD);
font_card.SetDefaultSize(400, 500); font_card.SetDefaultSize(400, 500);
if (font_card.Begin()) { if (font_card.Begin(font_visible)) {
DrawFontAtlas(); DrawFontAtlas();
DrawExpandedMessageSettings(); DrawExpandedMessageSettings();
} }
font_card.End(); font_card.End();
} }
// Dictionary Card // Dictionary Card - Get visibility flag and pass to Begin() for proper X button
if (card_registry->IsCardVisible(MakeCardId("message.dictionary"))) { bool* dict_visible = card_registry->GetVisibilityFlag(MakeCardId("message.dictionary"));
if (dict_visible && *dict_visible) {
static gui::EditorCard dict_card("Dictionary", ICON_MD_BOOK); static gui::EditorCard dict_card("Dictionary", ICON_MD_BOOK);
dict_card.SetDefaultSize(400, 500); dict_card.SetDefaultSize(400, 500);
if (dict_card.Begin()) { if (dict_card.Begin(dict_visible)) {
DrawTextCommands(); DrawTextCommands();
DrawSpecialCharacters(); DrawSpecialCharacters();
DrawDictionary(); DrawDictionary();

33
src/app/editor/music/music_editor.cc
View File

@@ -48,23 +48,32 @@ absl::Status MusicEditor::Update() {
instrument_card.SetDefaultSize(600, 500); instrument_card.SetDefaultSize(600, 500);
assembly_card.SetDefaultSize(700, 600); assembly_card.SetDefaultSize(700, 600);
// Music Tracker Card // Music Tracker Card - Check visibility flag exists and is true before rendering
if (tracker_card.Begin(card_registry->GetVisibilityFlag("music.tracker"))) { bool* tracker_visible = card_registry->GetVisibilityFlag("music.tracker");
DrawTrackerView(); if (tracker_visible && *tracker_visible) {
if (tracker_card.Begin(tracker_visible)) {
DrawTrackerView();
}
tracker_card.End();
} }
tracker_card.End();
// Instrument Editor Card // Instrument Editor Card - Check visibility flag exists and is true before rendering
if (instrument_card.Begin(card_registry->GetVisibilityFlag("music.instrument_editor"))) { bool* instrument_visible = card_registry->GetVisibilityFlag("music.instrument_editor");
DrawInstrumentEditor(); if (instrument_visible && *instrument_visible) {
if (instrument_card.Begin(instrument_visible)) {
DrawInstrumentEditor();
}
instrument_card.End();
} }
instrument_card.End();
// Assembly View Card // Assembly View Card - Check visibility flag exists and is true before rendering
if (assembly_card.Begin(card_registry->GetVisibilityFlag("music.assembly"))) { bool* assembly_visible = card_registry->GetVisibilityFlag("music.assembly");
assembly_editor_.InlineUpdate(); if (assembly_visible && *assembly_visible) {
if (assembly_card.Begin(assembly_visible)) {
assembly_editor_.InlineUpdate();
}
assembly_card.End();
} }
assembly_card.End();
return absl::OkStatus(); return absl::OkStatus();
} }

22
src/app/editor/sprite/sprite_editor.cc
View File

@@ -59,17 +59,23 @@ absl::Status SpriteEditor::Update() {
vanilla_card.SetDefaultSize(900, 700); vanilla_card.SetDefaultSize(900, 700);
custom_card.SetDefaultSize(800, 600); custom_card.SetDefaultSize(800, 600);
// Get visibility flags from card manager and pass to Begin() // Vanilla Sprites Card - Check visibility flag exists and is true before rendering
// Always call End() after Begin() - End() handles ImGui state safely bool* vanilla_visible = card_registry->GetVisibilityFlag("sprite.vanilla_editor");
if (vanilla_card.Begin(card_registry->GetVisibilityFlag("sprite.vanilla_editor"))) { if (vanilla_visible && *vanilla_visible) {
DrawVanillaSpriteEditor(); if (vanilla_card.Begin(vanilla_visible)) {
DrawVanillaSpriteEditor();
}
vanilla_card.End();
} }
vanilla_card.End();
if (custom_card.Begin(card_registry->GetVisibilityFlag("sprite.custom_editor"))) { // Custom Sprites Card - Check visibility flag exists and is true before rendering
DrawCustomSprites(); bool* custom_visible = card_registry->GetVisibilityFlag("sprite.custom_editor");
if (custom_visible && *custom_visible) {
if (custom_card.Begin(custom_visible)) {
DrawCustomSprites();
}
custom_card.End();
} }
custom_card.End();
return status_.ok() ? absl::OkStatus() : status_; return status_.ok() ? absl::OkStatus() : status_;
} }

215
src/app/editor/system/editor_card_registry.cc
View File

@@ -471,109 +471,192 @@ void EditorCardRegistry::DrawSidebar(size_t session_id,
const std::vector<std::string>& active_categories, const std::vector<std::string>& active_categories,
std::function<void(const std::string&)> on_category_switch, std::function<void(const std::string&)> on_category_switch,
std::function<void()> on_collapse) { std::function<void()> on_collapse) {
// Get cards for this session and category
auto cards = GetCardsInCategory(session_id, category);
if (cards.empty()) {
return;
}
// Use ThemeManager for consistent theming // Use ThemeManager for consistent theming
const auto& theme = gui::ThemeManager::Get().GetCurrentTheme(); const auto& theme = gui::ThemeManager::Get().GetCurrentTheme();
const float sidebar_width = GetSidebarWidth(); const float sidebar_width = GetSidebarWidth();
// Fixed sidebar window on the left edge of screen (VSCode style) // Fixed sidebar window on the left edge of screen - exactly like VSCode
ImGui::SetNextWindowPos(ImVec2(0, ImGui::GetFrameHeight())); // Below menu bar // Positioned below menu bar, spans full height, fixed 48px width
ImGui::SetNextWindowSize(ImVec2(sidebar_width + 220, -1)); // Full height below menu ImGui::SetNextWindowPos(ImVec2(0, ImGui::GetFrameHeight()));
ImGui::SetNextWindowSize(ImVec2(sidebar_width, -1)); // Exactly 48px wide, full height
ImGuiWindowFlags sidebar_flags = ImGuiWindowFlags sidebar_flags =
ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoTitleBar |
ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoResize |
ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoMove |
ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoCollapse |
ImGuiWindowFlags_NoDocking | // Don't allow docking over sidebar ImGuiWindowFlags_NoDocking |
ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollbar |
ImGuiWindowFlags_NoScrollWithMouse | ImGuiWindowFlags_NoScrollWithMouse |
ImGuiWindowFlags_NoFocusOnAppearing | // Don't steal focus ImGuiWindowFlags_NoFocusOnAppearing |
ImGuiWindowFlags_NoNavFocus; // Don't participate in nav ImGuiWindowFlags_NoNavFocus;
// Make sidebar VERY visible - fully opaque dark background // VSCode-style dark sidebar background with visible border
ImVec4 sidebar_bg = ImVec4(0.18f, 0.18f, 0.20f, 1.0f); // Dark opaque gray ImVec4 sidebar_bg = ImVec4(0.18f, 0.18f, 0.20f, 1.0f);
ImVec4 sidebar_border = ImVec4(0.4f, 0.4f, 0.45f, 1.0f); // Visible border ImVec4 sidebar_border = ImVec4(0.4f, 0.4f, 0.45f, 1.0f);
ImGui::PushStyleColor(ImGuiCol_WindowBg, sidebar_bg); ImGui::PushStyleColor(ImGuiCol_WindowBg, sidebar_bg);
ImGui::PushStyleColor(ImGuiCol_Border, sidebar_border); ImGui::PushStyleColor(ImGuiCol_Border, sidebar_border);
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(4.0f, 8.0f)); ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(4.0f, 8.0f));
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0.0f, 6.0f)); ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0.0f, 6.0f));
ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 2.0f); // Thicker border ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 2.0f);
ImGui::Begin("##EditorCardSidebar", nullptr, sidebar_flags); if (ImGui::Begin("##EditorCardSidebar", nullptr, sidebar_flags)) {
// Category switcher buttons at top (only if multiple editors are active)
if (active_categories.size() > 1) {
ImVec4 accent = gui::ConvertColorToImVec4(theme.accent);
ImVec4 inactive = gui::ConvertColorToImVec4(theme.button);
// Draw category tabs on the left (if multiple editors active) for (const auto& cat : active_categories) {
if (active_categories.size() > 1) { bool is_current = (cat == category);
ImGui::BeginChild("CategoryTabs", ImVec2(sidebar_width, 0), false,
ImGuiWindowFlags_NoScrollbar);
ImVec4 accent = gui::ConvertColorToImVec4(theme.accent); // Highlight current category with accent color
ImVec4 inactive = gui::ConvertColorToImVec4(theme.button); if (is_current) {
ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(accent.x, accent.y, accent.z, 0.8f));
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(accent.x, accent.y, accent.z, 1.0f));
} else {
ImGui::PushStyleColor(ImGuiCol_Button, inactive);
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, gui::ConvertColorToImVec4(theme.button_hovered));
}
for (const auto& cat : active_categories) { // Show first letter of category as button label
bool is_current = (cat == category); std::string btn_label = cat.empty() ? "?" : std::string(1, cat[0]);
if (ImGui::Button(btn_label.c_str(), ImVec2(40.0f, 32.0f))) {
// Switch to this category/editor
if (on_category_switch) {
on_category_switch(cat);
} else {
SetActiveCategory(cat);
}
}
if (is_current) { ImGui::PopStyleColor(2);
ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(accent.x, accent.y, accent.z, 0.8f));
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(accent.x, accent.y, accent.z, 1.0f));
} else {
ImGui::PushStyleColor(ImGuiCol_Button, inactive);
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, gui::ConvertColorToImVec4(theme.button_hovered));
}
// Use first letter as icon if (ImGui::IsItemHovered()) {
std::string icon = cat.substr(0, 1); ImGui::SetTooltip("%s Editor\nClick to switch", cat.c_str());
if (ImGui::Button(icon.c_str(), ImVec2(sidebar_width - 8, 40))) {
if (on_category_switch) {
on_category_switch(cat);
} }
} }
ImGui::PopStyleColor(2); ImGui::Dummy(ImVec2(0, 2.0f));
ImGui::Separator();
ImGui::Spacing();
}
// Get cards for current category
auto cards = GetCardsInCategory(session_id, category);
// Set this category as active when showing cards
if (!cards.empty()) {
SetActiveCategory(category);
}
// Close All and Show All buttons (only if cards exist)
if (!cards.empty()) {
ImVec4 error_color = gui::ConvertColorToImVec4(theme.error);
ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(
error_color.x * 0.6f, error_color.y * 0.6f, error_color.z * 0.6f, 0.9f));
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, error_color);
ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(
error_color.x * 1.2f, error_color.y * 1.2f, error_color.z * 1.2f, 1.0f));
if (ImGui::Button(ICON_MD_CLOSE, ImVec2(40.0f, 36.0f))) {
HideAllCardsInCategory(session_id, category);
}
ImGui::PopStyleColor(3);
if (ImGui::IsItemHovered()) { if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("%s", cat.c_str()); ImGui::SetTooltip("Close All %s Cards", category.c_str());
} }
}
// Collapse button at bottom // Show All button
ImGui::SetCursorPosY(ImGui::GetWindowHeight() - 50); ImVec4 success_color = gui::ConvertColorToImVec4(theme.success);
if (ImGui::Button(ICON_MD_CHEVRON_LEFT, ImVec2(sidebar_width - 8, 40))) { ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(
if (on_collapse) { success_color.x * 0.6f, success_color.y * 0.6f, success_color.z * 0.6f, 0.7f));
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, success_color);
ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(
success_color.x * 1.2f, success_color.y * 1.2f, success_color.z * 1.2f, 1.0f));
if (ImGui::Button(ICON_MD_DONE_ALL, ImVec2(40.0f, 36.0f))) {
ShowAllCardsInCategory(session_id, category);
}
ImGui::PopStyleColor(3);
if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("Show All %s Cards", category.c_str());
}
ImGui::Dummy(ImVec2(0, 2.0f));
// Draw individual card toggle buttons
ImVec4 accent_color = gui::ConvertColorToImVec4(theme.accent);
ImVec4 button_bg = gui::ConvertColorToImVec4(theme.button);
for (const auto& card : cards) {
ImGui::PushID(card.card_id.c_str());
bool is_active = card.visibility_flag && *card.visibility_flag;
// Highlight active cards with accent color
if (is_active) {
ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(
accent_color.x, accent_color.y, accent_color.z, 0.5f));
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(
accent_color.x, accent_color.y, accent_color.z, 0.7f));
ImGui::PushStyleColor(ImGuiCol_ButtonActive, accent_color);
} else {
ImGui::PushStyleColor(ImGuiCol_Button, button_bg);
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, gui::ConvertColorToImVec4(theme.button_hovered));
ImGui::PushStyleColor(ImGuiCol_ButtonActive, gui::ConvertColorToImVec4(theme.button_active));
}
// Icon-only button for each card
if (ImGui::Button(card.icon.c_str(), ImVec2(40.0f, 40.0f))) {
ToggleCard(session_id, card.card_id);
SetActiveCategory(category);
}
ImGui::PopStyleColor(3);
// Show tooltip with card name and shortcut
if (ImGui::IsItemHovered() || ImGui::IsItemActive()) {
SetActiveCategory(category);
ImGui::SetTooltip("%s\n%s", card.display_name.c_str(),
card.shortcut_hint.empty() ? "" : card.shortcut_hint.c_str());
}
ImGui::PopID();
}
} // End if (!cards.empty())
// Card Browser and Collapse buttons at bottom
if (on_collapse) {
ImGui::Dummy(ImVec2(0, 10.0f));
ImGui::Separator();
ImGui::Spacing();
// Collapse button
ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0.2f, 0.2f, 0.22f, 0.9f));
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(0.3f, 0.3f, 0.32f, 1.0f));
ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(0.25f, 0.25f, 0.27f, 1.0f));
if (ImGui::Button(ICON_MD_KEYBOARD_ARROW_LEFT, ImVec2(40.0f, 36.0f))) {
on_collapse(); on_collapse();
} }
ImGui::PopStyleColor(3);
if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("Hide Sidebar\nCtrl+B");
}
} }
if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("Hide Sidebar (Ctrl+B)");
}
ImGui::EndChild();
ImGui::SameLine();
} }
// Draw cards list on the right
ImGui::BeginChild("CardsList", ImVec2(0, 0), false);
ImGui::Text("%s %s", ICON_MD_DASHBOARD, category.c_str());
ImGui::Separator();
for (const auto& card : cards) {
DrawCardInSidebar(card, IsCardVisible(session_id, card.card_id));
}
ImGui::EndChild();
ImGui::End(); ImGui::End();
ImGui::PopStyleVar(3); ImGui::PopStyleVar(3); // WindowPadding, ItemSpacing, WindowBorderSize
ImGui::PopStyleColor(2); ImGui::PopStyleColor(2); // WindowBg, Border
} }
// ============================================================================ // ============================================================================

42
src/app/editor/system/settings_editor.cc
View File

@@ -93,21 +93,23 @@ absl::Status SettingsEditor::Update() {
if (!dependencies_.card_registry) return absl::OkStatus(); if (!dependencies_.card_registry) return absl::OkStatus();
auto* card_registry = dependencies_.card_registry; auto* card_registry = dependencies_.card_registry;
// General Settings Card // General Settings Card - Check visibility flag and pass to Begin() for proper X button
if (card_registry->IsCardVisible(MakeCardId("settings.general"))) { bool* general_visible = card_registry->GetVisibilityFlag(MakeCardId("settings.general"));
if (general_visible && *general_visible) {
static gui::EditorCard general_card("General Settings", ICON_MD_SETTINGS); static gui::EditorCard general_card("General Settings", ICON_MD_SETTINGS);
general_card.SetDefaultSize(600, 500); general_card.SetDefaultSize(600, 500);
if (general_card.Begin()) { if (general_card.Begin(general_visible)) {
DrawGeneralSettings(); DrawGeneralSettings();
} }
general_card.End(); general_card.End();
} }
// Appearance Card (Themes + Font Manager combined) // Appearance Card (Themes + Font Manager combined) - Check visibility and pass flag
if (card_registry->IsCardVisible(MakeCardId("settings.appearance"))) { bool* appearance_visible = card_registry->GetVisibilityFlag(MakeCardId("settings.appearance"));
if (appearance_visible && *appearance_visible) {
static gui::EditorCard appearance_card("Appearance", ICON_MD_PALETTE); static gui::EditorCard appearance_card("Appearance", ICON_MD_PALETTE);
appearance_card.SetDefaultSize(600, 600); appearance_card.SetDefaultSize(600, 600);
if (appearance_card.Begin()) { if (appearance_card.Begin(appearance_visible)) {
DrawThemeSettings(); DrawThemeSettings();
ImGui::Separator(); ImGui::Separator();
gui::DrawFontManager(); gui::DrawFontManager();
@@ -115,41 +117,45 @@ absl::Status SettingsEditor::Update() {
appearance_card.End(); appearance_card.End();
} }
// Editor Behavior Card // Editor Behavior Card - Check visibility and pass flag
if (card_registry->IsCardVisible(MakeCardId("settings.editor_behavior"))) { bool* behavior_visible = card_registry->GetVisibilityFlag(MakeCardId("settings.editor_behavior"));
if (behavior_visible && *behavior_visible) {
static gui::EditorCard behavior_card("Editor Behavior", ICON_MD_TUNE); static gui::EditorCard behavior_card("Editor Behavior", ICON_MD_TUNE);
behavior_card.SetDefaultSize(600, 500); behavior_card.SetDefaultSize(600, 500);
if (behavior_card.Begin()) { if (behavior_card.Begin(behavior_visible)) {
DrawEditorBehavior(); DrawEditorBehavior();
} }
behavior_card.End(); behavior_card.End();
} }
// Performance Card // Performance Card - Check visibility and pass flag
if (card_registry->IsCardVisible(MakeCardId("settings.performance"))) { bool* perf_visible = card_registry->GetVisibilityFlag(MakeCardId("settings.performance"));
if (perf_visible && *perf_visible) {
static gui::EditorCard perf_card("Performance", ICON_MD_SPEED); static gui::EditorCard perf_card("Performance", ICON_MD_SPEED);
perf_card.SetDefaultSize(600, 450); perf_card.SetDefaultSize(600, 450);
if (perf_card.Begin()) { if (perf_card.Begin(perf_visible)) {
DrawPerformanceSettings(); DrawPerformanceSettings();
} }
perf_card.End(); perf_card.End();
} }
// AI Agent Settings Card // AI Agent Settings Card - Check visibility and pass flag
if (card_registry->IsCardVisible(MakeCardId("settings.ai_agent"))) { bool* ai_visible = card_registry->GetVisibilityFlag(MakeCardId("settings.ai_agent"));
if (ai_visible && *ai_visible) {
static gui::EditorCard ai_card("AI Agent", ICON_MD_SMART_TOY); static gui::EditorCard ai_card("AI Agent", ICON_MD_SMART_TOY);
ai_card.SetDefaultSize(600, 550); ai_card.SetDefaultSize(600, 550);
if (ai_card.Begin()) { if (ai_card.Begin(ai_visible)) {
DrawAIAgentSettings(); DrawAIAgentSettings();
} }
ai_card.End(); ai_card.End();
} }
// Keyboard Shortcuts Card // Keyboard Shortcuts Card - Check visibility and pass flag
if (card_registry->IsCardVisible(MakeCardId("settings.shortcuts"))) { bool* shortcuts_visible = card_registry->GetVisibilityFlag(MakeCardId("settings.shortcuts"));
if (shortcuts_visible && *shortcuts_visible) {
static gui::EditorCard shortcuts_card("Keyboard Shortcuts", ICON_MD_KEYBOARD); static gui::EditorCard shortcuts_card("Keyboard Shortcuts", ICON_MD_KEYBOARD);
shortcuts_card.SetDefaultSize(700, 600); shortcuts_card.SetDefaultSize(700, 600);
if (shortcuts_card.Begin()) { if (shortcuts_card.Begin(shortcuts_visible)) {
DrawKeyboardShortcuts(); DrawKeyboardShortcuts();
} }
shortcuts_card.End(); shortcuts_card.End();

22
src/app/editor/ui/ui_coordinator.cc
View File

@@ -173,21 +173,17 @@ void UICoordinator::DrawMenuBarExtras() {
} }
void UICoordinator::DrawContextSensitiveCardControl() { void UICoordinator::DrawContextSensitiveCardControl() {
// Get current editor and determine category // Get the currently active editor directly from EditorManager
auto* current_editor = editor_manager_->GetCurrentEditorSet(); // This ensures we show cards for the correct editor that has focus
if (!current_editor) return; auto* active_editor = editor_manager_->GetCurrentEditor();
// Find active card-based editor
Editor* active_editor = nullptr;
for (auto* editor : current_editor->active_editors_) {
if (*editor->active() && editor_registry_.IsCardBasedEditor(editor->type())) {
active_editor = editor;
break;
}
}
if (!active_editor) return; if (!active_editor) return;
// Only show card control for card-based editors (not palette, not assembly in legacy mode, etc.)
if (!editor_registry_.IsCardBasedEditor(active_editor->type())) {
return;
}
// Get the category and session for the active editor
std::string category = editor_registry_.GetEditorCategory(active_editor->type()); std::string category = editor_registry_.GetEditorCategory(active_editor->type());
size_t session_id = editor_manager_->GetCurrentSessionId(); size_t session_id = editor_manager_->GetCurrentSessionId();

74
src/app/emu/emulator.cc
View File

@@ -381,54 +381,86 @@ void Emulator::RenderEmulatorInterface() {
breakpoints_card.SetDefaultSize(400, 350); breakpoints_card.SetDefaultSize(400, 350);
performance_card.SetDefaultSize(350, 300); performance_card.SetDefaultSize(350, 300);
if (card_registry_->IsCardVisible("emulator.cpu_debugger") && cpu_card.Begin()) { // Get visibility flags from registry and pass them to Begin() for proper X button functionality
RenderModernCpuDebugger(); // This ensures each card window can be closed by the user via the window close button
bool* cpu_visible = card_registry_->GetVisibilityFlag("emulator.cpu_debugger");
if (cpu_visible && *cpu_visible) {
if (cpu_card.Begin(cpu_visible)) {
RenderModernCpuDebugger();
}
cpu_card.End(); cpu_card.End();
} }
if (card_registry_->IsCardVisible("emulator.ppu_viewer") && ppu_card.Begin()) { bool* ppu_visible = card_registry_->GetVisibilityFlag("emulator.ppu_viewer");
RenderNavBar(); if (ppu_visible && *ppu_visible) {
RenderSnesPpu(); if (ppu_card.Begin(ppu_visible)) {
RenderNavBar();
RenderSnesPpu();
}
ppu_card.End(); ppu_card.End();
} }
if (card_registry_->IsCardVisible("emulator.memory_viewer") && memory_card.Begin()) { bool* memory_visible = card_registry_->GetVisibilityFlag("emulator.memory_viewer");
RenderMemoryViewer(); if (memory_visible && *memory_visible) {
if (memory_card.Begin(memory_visible)) {
RenderMemoryViewer();
}
memory_card.End(); memory_card.End();
} }
if (card_registry_->IsCardVisible("emulator.breakpoints") && breakpoints_card.Begin()) { bool* breakpoints_visible = card_registry_->GetVisibilityFlag("emulator.breakpoints");
RenderBreakpointList(); if (breakpoints_visible && *breakpoints_visible) {
if (breakpoints_card.Begin(breakpoints_visible)) {
RenderBreakpointList();
}
breakpoints_card.End(); breakpoints_card.End();
} }
if (card_registry_->IsCardVisible("emulator.performance") && performance_card.Begin()) { bool* performance_visible = card_registry_->GetVisibilityFlag("emulator.performance");
RenderPerformanceMonitor(); if (performance_visible && *performance_visible) {
if (performance_card.Begin(performance_visible)) {
RenderPerformanceMonitor();
}
performance_card.End(); performance_card.End();
} }
if (card_registry_->IsCardVisible("emulator.ai_agent") && ai_card.Begin()) { bool* ai_agent_visible = card_registry_->GetVisibilityFlag("emulator.ai_agent");
RenderAIAgentPanel(); if (ai_agent_visible && *ai_agent_visible) {
if (ai_card.Begin(ai_agent_visible)) {
RenderAIAgentPanel();
}
ai_card.End(); ai_card.End();
} }
if (card_registry_->IsCardVisible("emulator.save_states") && save_states_card.Begin()) { bool* save_states_visible = card_registry_->GetVisibilityFlag("emulator.save_states");
RenderSaveStates(); if (save_states_visible && *save_states_visible) {
if (save_states_card.Begin(save_states_visible)) {
RenderSaveStates();
}
save_states_card.End(); save_states_card.End();
} }
if (card_registry_->IsCardVisible("emulator.keyboard_config") && keyboard_card.Begin()) { bool* keyboard_config_visible = card_registry_->GetVisibilityFlag("emulator.keyboard_config");
RenderKeyboardConfig(); if (keyboard_config_visible && *keyboard_config_visible) {
if (keyboard_card.Begin(keyboard_config_visible)) {
RenderKeyboardConfig();
}
keyboard_card.End(); keyboard_card.End();
} }
if (card_registry_->IsCardVisible("emulator.apu_debugger") && apu_card.Begin()) { bool* apu_debugger_visible = card_registry_->GetVisibilityFlag("emulator.apu_debugger");
RenderApuDebugger(); if (apu_debugger_visible && *apu_debugger_visible) {
if (apu_card.Begin(apu_debugger_visible)) {
RenderApuDebugger();
}
apu_card.End(); apu_card.End();
} }
if (card_registry_->IsCardVisible("emulator.audio_mixer") && audio_card.Begin()) { bool* audio_mixer_visible = card_registry_->GetVisibilityFlag("emulator.audio_mixer");
// RenderAudioMixer(); if (audio_mixer_visible && *audio_mixer_visible) {
if (audio_card.Begin(audio_mixer_visible)) {
// RenderAudioMixer();
}
audio_card.End(); audio_card.End();
} }