Revert "Remove some BUI boilerplate" (#30214)

Revert "Remove some BUI boilerplate (#28399)"

This reverts commit cbf329a82d.

Content.Client/PDA/PdaBoundUserInterface.cs

@@ -24,13 +24,14 @@ namespace Content.Client.PDA
 
             if (_menu == null)
                 CreateMenu();
+
+            _menu?.OpenCenteredLeft();
         }
 
         private void CreateMenu()
         {
-            _menu = this.CreateWindow<PdaMenu>();
-            _menu.OpenCenteredLeft();
-
+            _menu = new PdaMenu();
+            _menu.OnClose += Close;
             _menu.FlashLightToggleButton.OnToggled += _ =>
             {
                 SendMessage(new PdaToggleFlashlightMessage());
@@ -95,6 +96,7 @@ namespace Content.Client.PDA
             _menu?.UpdateState(updateState);
         }
 
+
         protected override void AttachCartridgeUI(Control cartridgeUIFragment, string? title)
         {
             _menu?.ProgramView.AddChild(cartridgeUIFragment);
@@ -116,6 +118,15 @@ namespace Content.Client.PDA
             _menu?.UpdateAvailablePrograms(programs);
         }
 
+        protected override void Dispose(bool disposing)
+        {
+            base.Dispose(disposing);
+            if (!disposing)
+                return;
+
+            _menu?.Dispose();
+        }
+
         private PdaBorderColorComponent? GetBorderColorComponent()
         {
             return EntMan.GetComponentOrNull<PdaBorderColorComponent>(Owner);

Content.Client/PDA/Ringer/RingerBoundUserInterface.cs

@@ -1,7 +1,6 @@
 using Content.Shared.PDA;
 using Content.Shared.PDA.Ringer;
 using JetBrains.Annotations;
-using Robust.Client.UserInterface;
 using Robust.Shared.Timing;
 
 namespace Content.Client.PDA.Ringer
@@ -19,8 +18,9 @@ namespace Content.Client.PDA.Ringer
         protected override void Open()
         {
             base.Open();
-            _menu = this.CreateWindow<RingtoneMenu>();
+            _menu = new RingtoneMenu();
             _menu.OpenToLeft();
+            _menu.OnClose += Close;
 
             _menu.TestRingerButton.OnPressed += _ =>
             {