From 908eb147a1213958a8bacb7873f2aa1198512fe5 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Sat, 9 Jul 2022 18:54:30 -0400
Subject: [PATCH] editor housekeeping

---
 src/app/editor/assembly_editor.h   |  3 ++-
 src/app/editor/overworld_editor.cc | 24 +++---------------------
 src/app/editor/overworld_editor.h  |  3 ---
 3 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/src/app/editor/assembly_editor.h b/src/app/editor/assembly_editor.h
index 2a49c6b1..a9b24991 100644
--- a/src/app/editor/assembly_editor.h
+++ b/src/app/editor/assembly_editor.h
@@ -24,8 +24,9 @@ class AssemblyEditor {
   void DrawEditMenu();
   void SetEditorText();
 
-  std::string current_file_;
   bool file_is_loaded_ = false;
+
+  std::string current_file_;
   TextEditor text_editor_;
 };
 
diff --git a/src/app/editor/overworld_editor.cc b/src/app/editor/overworld_editor.cc
index 9e3396aa..7708589a 100644
--- a/src/app/editor/overworld_editor.cc
+++ b/src/app/editor/overworld_editor.cc
@@ -35,10 +35,6 @@ void OverworldEditor::Update() {
     all_gfx_loaded_ = true;
   }
 
-  if (show_changelist_) {
-    DrawChangelist();
-  }
-
   DrawToolset();
   ImGui::Separator();
   if (ImGui::BeginTable("#owEditTable", 2, ow_edit_flags, ImVec2(0, 0))) {
@@ -80,14 +76,6 @@ void OverworldEditor::DrawToolset() {
     ImGui::TableNextColumn();
     ImGui::Button(ICON_MD_REDO);
 
-    ImGui::TableNextColumn();
-    if (ImGui::Button(ICON_MD_MANAGE_HISTORY)) {
-      if (!show_changelist_)
-        show_changelist_ = true;
-      else
-        show_changelist_ = false;
-    }
-
     ImGui::TableNextColumn();
     ImGui::Text(ICON_MD_MORE_VERT);
 
@@ -129,6 +117,9 @@ void OverworldEditor::DrawToolset() {
       overworld_.Load(rom_, allGfx16Ptr);
     }
 
+    ImGui::TableNextColumn();
+    ImGui::Text(ICON_MD_MORE_VERT);
+
     ImGui::TableNextColumn();
     ImGui::Text("Palette:");
     for (int i = 0; i < 8; i++) {
@@ -428,15 +419,6 @@ void OverworldEditor::DrawTile8Selector() {
   draw_list->PopClipRect();
 }
 
-void OverworldEditor::DrawChangelist() {
-  if (!ImGui::Begin("Changelist")) {
-    ImGui::End();
-  }
-
-  ImGui::Text("Test");
-  ImGui::End();
-}
-
 void OverworldEditor::LoadGraphics() {
   for (int i = 0; i < kNumSheetsToLoad; i++) {
     all_texture_sheet_[i] = rom_.DrawGraphicsSheet(i);
diff --git a/src/app/editor/overworld_editor.h b/src/app/editor/overworld_editor.h
index 71569a1a..387982d6 100644
--- a/src/app/editor/overworld_editor.h
+++ b/src/app/editor/overworld_editor.h
@@ -28,8 +28,6 @@ class OverworldEditor {
   void DrawTile16Selector();
   void DrawTile8Selector();
 
-  void DrawChangelist();
-
   void LoadBlockset();
   void LoadGraphics();
 
@@ -61,7 +59,6 @@ class OverworldEditor {
   bool isLoaded = false;
   bool doneLoaded = false;
   bool opt_enable_grid = true;
-  bool show_changelist_ = false;
   bool all_gfx_loaded_ = false;
   bool map_blockset_loaded_ = false;