From 12d2d212fd86f7f490c7014720a68ada475d06a7 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Thu, 13 Mar 2025 09:26:39 -0400
Subject: [PATCH] Refactor Tile16Editor

---
 src/app/editor/graphics/tile16_editor.cc | 27 ++++++------------------
 src/app/editor/graphics/tile16_editor.h  |  3 ---
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/src/app/editor/graphics/tile16_editor.cc b/src/app/editor/graphics/tile16_editor.cc
index c2e30a2f..df19596e 100644
--- a/src/app/editor/graphics/tile16_editor.cc
+++ b/src/app/editor/graphics/tile16_editor.cc
@@ -85,16 +85,6 @@ absl::Status Tile16Editor::Update() {
     return absl::InvalidArgumentError("Blockset not initialized, open a ROM.");
   }
 
-  RETURN_IF_ERROR(DrawMenu());
-  if (BeginTabBar("Tile16 Editor Tabs")) {
-    DrawTile16Editor();
-    RETURN_IF_ERROR(UpdateTile16Transfer());
-    EndTabBar();
-  }
-  return absl::OkStatus();
-}
-
-absl::Status Tile16Editor::DrawMenu() {
   if (BeginMenuBar()) {
     if (BeginMenu("View")) {
       Checkbox("Show Collision Types",
@@ -103,6 +93,12 @@ absl::Status Tile16Editor::DrawMenu() {
     }
     EndMenuBar();
   }
+
+  if (BeginTabBar("Tile16 Editor Tabs")) {
+    DrawTile16Editor();
+    RETURN_IF_ERROR(UpdateTile16Transfer());
+    EndTabBar();
+  }
   return absl::OkStatus();
 }
 
@@ -118,20 +114,12 @@ void Tile16Editor::DrawTile16Editor() {
       TableNextRow();
       TableNextColumn();
       status_ = UpdateBlockset();
-      if (!status_.ok()) {
-        EndTable();
-      }
 
       TableNextColumn();
       status_ = UpdateTile16Edit();
-      if (status_ != absl::OkStatus()) {
-        EndTable();
-      }
-      status_ = DrawTileEditControls();
 
       EndTable();
     }
-
     EndTabItem();
   }
 }
@@ -248,10 +236,7 @@ absl::Status Tile16Editor::UpdateTile16Edit() {
     tile16_edit_canvas_.DrawOverlay();
   }
   EndChild();
-  return absl::OkStatus();
-}
 
-absl::Status Tile16Editor::DrawTileEditControls() {
   Separator();
   Text("Options:");
   gui::InputHexByte("Palette", &notify_palette.edit());
diff --git a/src/app/editor/graphics/tile16_editor.h b/src/app/editor/graphics/tile16_editor.h
index 8ed60b08..e079f4a9 100644
--- a/src/app/editor/graphics/tile16_editor.h
+++ b/src/app/editor/graphics/tile16_editor.h
@@ -32,7 +32,6 @@ class Tile16Editor : public gfx::GfxContext, public SharedRom {
                           std::array<uint8_t, 0x200> &all_tiles_types);
 
   absl::Status Update();
-  absl::Status DrawMenu();
 
   void DrawTile16Editor();
   absl::Status UpdateTile16Transfer();
@@ -42,8 +41,6 @@ class Tile16Editor : public gfx::GfxContext, public SharedRom {
 
   absl::Status UpdateTile16Edit();
 
-  absl::Status DrawTileEditControls();
-
   absl::Status UpdateTransferTileCanvas();
 
   absl::Status LoadTile8();