update FlagsMenu

src/app/editor/master_editor.cc

@@ -540,10 +540,13 @@ void MasterEditor::DrawFileMenu() {
       MenuItem("Backup ROM", "", &backup_rom_);
       MenuItem("Save New Auto", "", &save_new_auto_);
       Separator();
+      if (BeginMenu("Experiment Flags")) {
         static FlagsMenu flags_menu;
         flags_menu.Draw();
         ImGui::EndMenu();
       }
+      ImGui::EndMenu();
+    }
 
     Separator();
 

src/app/editor/settings_editor.cc

@@ -8,8 +8,13 @@ namespace yaze {
 namespace app {
 namespace editor {
 
+using ImGui::BeginChild;
+using ImGui::BeginMenu;
 using ImGui::BeginTabBar;
 using ImGui::BeginTabItem;
+using ImGui::Checkbox;
+using ImGui::EndChild;
+using ImGui::EndMenu;
 using ImGui::EndTabBar;
 using ImGui::EndTabItem;
 using ImGui::Text;
@@ -17,8 +22,12 @@ using ImGui::Text;
 absl::Status SettingsEditor::Update() {
   if (BeginTabBar("Settings", ImGuiTabBarFlags_None)) {
     if (BeginTabItem("General")) {
+      if (BeginChild("##GeneralSettingsStyleWrapper", ImVec2(0, 0),
+                     ImGuiChildFlags_FrameStyle)) {
         static FlagsMenu flags;
         flags.Draw();
+      }
+      EndChild();
       EndTabItem();
     }
     if (BeginTabItem("Keyboard Shortcuts")) {

src/app/editor/utils/flags.h

@@ -16,7 +16,6 @@ using ImGui::Separator;
 
 struct FlagsMenu : public core::ExperimentFlags {
   void Draw() {
-    if (BeginMenu("Experiment Flags")) {
     if (BeginMenu("Overworld Flags")) {
       Checkbox("Enable Overworld Sprites",
                &mutable_flags()->overworld.kDrawOverworldSprites);
@@ -58,8 +57,6 @@ struct FlagsMenu : public core::ExperimentFlags {
     Checkbox("Save All Palettes", &mutable_flags()->kSaveAllPalettes);
     Checkbox("Save Gfx Groups", &mutable_flags()->kSaveGfxGroups);
     Checkbox("Use New ImGui Input", &mutable_flags()->kUseNewImGuiInput);
-      ImGui::EndMenu();
-    }
   }
 };