Refactor tab handling in Dungeon and Graphics editors for improved readability

src/app/editor/graphics/graphics_editor.cc

@@ -34,25 +34,11 @@ using ImGui::InputText;
 using ImGui::SameLine;
 using ImGui::TableNextColumn;
 
-static constexpr absl::string_view kGfxToolsetColumnNames[] = {
-    "#memoryEditor",
-    "##separator_gfx1",
-};
-
 constexpr ImGuiTableFlags kGfxEditTableFlags =
     ImGuiTableFlags_Borders | ImGuiTableFlags_Resizable |
     ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable |
     ImGuiTableFlags_SizingFixedFit;
 
-constexpr ImGuiTabBarFlags kGfxEditTabBarFlags =
-    ImGuiTabBarFlags_AutoSelectNewTabs | ImGuiTabBarFlags_Reorderable |
-    ImGuiTabBarFlags_FittingPolicyResizeDown |
-    ImGuiTabBarFlags_TabListPopupButton;
-
-constexpr ImGuiTableFlags kGfxEditFlags = ImGuiTableFlags_Reorderable |
-                                          ImGuiTableFlags_Resizable |
-                                          ImGuiTableFlags_SizingStretchSame;
-
 absl::Status GraphicsEditor::Update() {
   if (ImGui::BeginTabBar("##TabBar")) {
     status_ = UpdateGfxEdit();
@@ -260,6 +246,10 @@ absl::Status GraphicsEditor::UpdateGfxSheetList() {
 
 absl::Status GraphicsEditor::UpdateGfxTabView() {
   static int next_tab_id = 0;
+  constexpr ImGuiTabBarFlags kGfxEditTabBarFlags =
+      ImGuiTabBarFlags_AutoSelectNewTabs | ImGuiTabBarFlags_Reorderable |
+      ImGuiTabBarFlags_FittingPolicyResizeDown |
+      ImGuiTabBarFlags_TabListPopupButton;
 
   if (ImGui::BeginTabBar("##GfxEditTabBar", kGfxEditTabBarFlags)) {
     if (ImGui::TabItemButton(ICON_MD_ADD, ImGuiTabItemFlags_Trailing |
@@ -439,6 +429,10 @@ absl::Status GraphicsEditor::UpdateScadView() {
     ImGui::End();
   }
 
+  constexpr ImGuiTableFlags kGfxEditFlags = ImGuiTableFlags_Reorderable |
+                                            ImGuiTableFlags_Resizable |
+                                            ImGuiTableFlags_SizingStretchSame;
+
   BEGIN_TABLE("#gfxEditTable", 4, kGfxEditFlags)
   SETUP_COLUMN("File Import (BIN, CGX, ROM)")
   SETUP_COLUMN("Palette (COL)")
@@ -490,6 +484,11 @@ absl::Status GraphicsEditor::UpdateScadView() {
 }
 
 absl::Status GraphicsEditor::DrawToolset() {
+  static constexpr absl::string_view kGfxToolsetColumnNames[] = {
+      "#memoryEditor",
+      "##separator_gfx1",
+  };
+
   if (ImGui::BeginTable("GraphicsToolset", 2, ImGuiTableFlags_SizingFixedFit,
                         ImVec2(0, 0))) {
     for (const auto& name : kGfxToolsetColumnNames)

src/app/editor/graphics/screen_editor.cc

@@ -26,17 +26,19 @@ using core::Renderer;
 constexpr uint32_t kRedPen = 0xFF0000FF;
 
 absl::Status ScreenEditor::Update() {
-  TAB_BAR("##TabBar")
-  TAB_ITEM("Dungeon Maps")
-  if (rom()->is_loaded()) {
-    DrawDungeonMapsEditor();
+  if (ImGui::BeginTabBar("##ScreenEditorTabBar")) {
+    if (ImGui::BeginTabItem("Dungeon Maps")) {
+      if (rom()->is_loaded()) {
+        DrawDungeonMapsEditor();
+      }
+      ImGui::EndTabItem();
+    }
+    DrawInventoryMenuEditor();
+    DrawOverworldMapEditor();
+    DrawTitleScreenEditor();
+    DrawNamingScreenEditor();
+    ImGui::EndTabBar();
   }
-  END_TAB_ITEM()
-  DrawInventoryMenuEditor();
-  DrawOverworldMapEditor();
-  DrawTitleScreenEditor();
-  DrawNamingScreenEditor();
-  END_TAB_BAR()
   return status_;
 }
 
@@ -483,6 +485,7 @@ void ScreenEditor::DrawDungeonMapsEditor() {
     ImGui::TableNextColumn();
     tilemap_canvas_.DrawBackground(ImVec2(128 * 2 + 2, (192 * 2) + 4));
     tilemap_canvas_.DrawContextMenu();
+    tilemap_canvas_.DrawTileSelector(8.f);
     tilemap_canvas_.DrawBitmapTable(sheets_);
     tilemap_canvas_.DrawGrid();
     tilemap_canvas_.DrawOverlay();
@@ -524,16 +527,21 @@ void ScreenEditor::LoadBinaryGfx() {
 }
 
 void ScreenEditor::DrawTitleScreenEditor() {
-  TAB_ITEM("Title Screen")
-  END_TAB_ITEM()
+  if (ImGui::BeginTabItem("Title Screen")) {
+    ImGui::EndTabItem();
+  }
 }
+
 void ScreenEditor::DrawNamingScreenEditor() {
-  TAB_ITEM("Naming Screen")
-  END_TAB_ITEM()
+  if (ImGui::BeginTabItem("Naming Screen")) {
+    ImGui::EndTabItem();
+  }
 }
+
 void ScreenEditor::DrawOverworldMapEditor() {
-  TAB_ITEM("Overworld Map")
-  END_TAB_ITEM()
+  if (ImGui::BeginTabItem("Overworld Map")) {
+    ImGui::EndTabItem();
+  }
 }
 
 void ScreenEditor::DrawToolset() {