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

refactor: Improve Editor Management and UI Consistency

Browse Source 
- Removed PushID and PopID calls in EditorManager to prevent ID stack corruption, relying on window titles for uniqueness.
- Updated ImGui window size and position settings to use FirstUseEver for maximizing on first open, enhancing user experience.
- Replaced AgentUI::PopPanelStyle with ImGui::PopStyleColor in multiple locations for consistency in style management.
- Ensured all EditorCard instances consistently call End after Begin, improving code clarity and preventing potential rendering issues.
This commit is contained in:
scawful
2025-10-06 00:33:10 -04:00
parent 5dca8ecc79
commit dd56addd5e
9 changed files with 287 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,27 +56,35 @@ absl::Status GraphicsEditor::Update() {
static gui::EditorCard player_anims_card("Player Animations", ICON_MD_PERSON);
static gui::EditorCard prototype_card("Prototype Viewer", ICON_MD_CONSTRUCTION);
if (show_sheet_editor_ && sheet_editor_card.Begin(&show_sheet_editor_)) {
status_ = UpdateGfxEdit();
sheet_editor_card.End();
}
if (show_sheet_browser_ && sheet_browser_card.Begin(&show_sheet_browser_)) {
if (asset_browser_.Initialized == false) {
asset_browser_.Initialize(gfx::Arena::Get().gfx_sheets());
if (show_sheet_editor_) {
if (sheet_editor_card.Begin(&show_sheet_editor_)) {
status_ = UpdateGfxEdit();
}
asset_browser_.Draw(gfx::Arena::Get().gfx_sheets());
sheet_browser_card.End();
sheet_editor_card.End(); // ALWAYS call End after Begin
}
if (show_player_animations_ && player_anims_card.Begin(&show_player_animations_)) {
status_ = UpdateLinkGfxView();
player_anims_card.End();
if (show_sheet_browser_) {
if (sheet_browser_card.Begin(&show_sheet_browser_)) {
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(); // ALWAYS call End after Begin
}
if (show_prototype_viewer_ && prototype_card.Begin(&show_prototype_viewer_)) {
status_ = UpdateScadView();
prototype_card.End();
if (show_player_animations_) {
if (player_anims_card.Begin(&show_player_animations_)) {
status_ = UpdateLinkGfxView();
}
player_anims_card.End(); // ALWAYS call End after Begin
}
if (show_prototype_viewer_) {
if (prototype_card.Begin(&show_prototype_viewer_)) {
status_ = UpdateScadView();
}
prototype_card.End(); // ALWAYS call End after Begin
}
CLEAR_AND_RETURN_STATUS(status_)

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

@@ -74,25 +74,35 @@ absl::Status ScreenEditor::Update() {
static gui::EditorCard title_screen_card("Title Screen", ICON_MD_TITLE);
static gui::EditorCard naming_screen_card("Naming Screen", ICON_MD_EDIT_ATTRIBUTES);
if (show_dungeon_maps_ && dungeon_maps_card.Begin(&show_dungeon_maps_)) {
DrawDungeonMapsEditor();
dungeon_maps_card.End();
if (show_dungeon_maps_) {
if (dungeon_maps_card.Begin(&show_dungeon_maps_)) {
DrawDungeonMapsEditor();
}
dungeon_maps_card.End(); // ALWAYS call End after Begin
}
if (show_inventory_menu_ && inventory_menu_card.Begin(&show_inventory_menu_)) {
DrawInventoryMenuEditor();
inventory_menu_card.End();
if (show_inventory_menu_) {
if (inventory_menu_card.Begin(&show_inventory_menu_)) {
DrawInventoryMenuEditor();
}
inventory_menu_card.End(); // ALWAYS call End after Begin
}
if (show_overworld_map_ && overworld_map_card.Begin(&show_overworld_map_)) {
DrawOverworldMapEditor();
overworld_map_card.End();
if (show_overworld_map_) {
if (overworld_map_card.Begin(&show_overworld_map_)) {
DrawOverworldMapEditor();
}
overworld_map_card.End(); // ALWAYS call End after Begin
}
if (show_title_screen_ && title_screen_card.Begin(&show_title_screen_)) {
DrawTitleScreenEditor();
title_screen_card.End();
if (show_title_screen_) {
if (title_screen_card.Begin(&show_title_screen_)) {
DrawTitleScreenEditor();
}
title_screen_card.End(); // ALWAYS call End after Begin
}
if (show_naming_screen_ && naming_screen_card.Begin(&show_naming_screen_)) {
DrawNamingScreenEditor();
naming_screen_card.End();
if (show_naming_screen_) {
if (naming_screen_card.Begin(&show_naming_screen_)) {
DrawNamingScreenEditor();
}
naming_screen_card.End(); // ALWAYS call End after Begin
}
return status_;