Fix plugin removal in non-DAW mode

mikeoliphant · May 10, 2024 · 2b3d241 · 2b3d241
1 parent 1ba6352
commit 2b3d241
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 20 deletions.
diff --git a/StompboxHost/Program.cs b/StompboxHost/Program.cs
@@ -8,7 +8,7 @@ class Program
         [STAThread]
         static void Main(string[] args)
         {
-            StompboxGame.DAWMode = true;
+            StompboxGame.DAWMode = false;
 
             StompboxPlugin plugin = new StompboxPlugin();
 

diff --git a/StompboxPlugin/StompboxPlugin.cs b/StompboxPlugin/StompboxPlugin.cs
@@ -61,8 +61,8 @@ public override void Initialize()
             }
 			else
 			{
-                EditorWidth = 540;
-                EditorHeight = 960;
+                EditorWidth = 378;
+                EditorHeight = 672;
             }
 
 

diff --git a/StompboxShared/Interface/MainInterface.cs b/StompboxShared/Interface/MainInterface.cs
@@ -161,7 +161,7 @@ public MainInterface()
                 };
                 Children.Add(vStack);
 
-                topUIStack = new HorizontalStack { HorizontalAlignment = EHorizontalAlignment.Stretch, DesiredHeight = 400 };
+                topUIStack = new HorizontalStack { HorizontalAlignment = EHorizontalAlignment.Stretch};
                 vStack.Children.Add(topUIStack);
 
                 programStack = new VerticalStack { HorizontalAlignment = EHorizontalAlignment.Stretch, VerticalAlignment = EVerticalAlignment.Center };
@@ -433,7 +433,7 @@ void AddAmpPlugin(IAudioPlugin plugin, string slotName)
             }
             else
             {
-                ampStack.Children.Add(new MiniPluginButton(plugin)
+                ampStack.Children.Add(new MiniPluginInterface(plugin)
                 {
                     ClickAction = delegate { MainInterface.Instance.SetSelectedPlugin(plugin, null); }
                 });

diff --git a/StompboxShared/Interface/PluginInterface.cs b/StompboxShared/Interface/PluginInterface.cs
@@ -84,7 +84,7 @@ public void SetChain(List<IAudioPlugin> plugins)
                 }
                 else
                 {
-                    pluginStack.Children.Add(new MiniPluginButton(plugin) { ClickAction = delegate { MainInterface.Instance.SetSelectedPlugin(plugin, this); } });
+                    pluginStack.Children.Add(new MiniPluginInterface(plugin) { ClickAction = delegate { MainInterface.Instance.SetSelectedPlugin(plugin, this); } });
                 }
             }
         }
@@ -144,7 +144,7 @@ void AddPlugin()
                     }
                     else
                     {
-                        pluginStack.Children.Add(new MiniPluginButton(newPlugin)
+                        pluginStack.Children.Add(new MiniPluginInterface(newPlugin)
                         {
                             ClickAction = delegate
                             {
@@ -178,7 +178,7 @@ public PluginFlipList(List<IAudioPlugin> plugins)
 
             foreach (IAudioPlugin plugin in plugins)
             {
-                Children.Add(new MiniPluginButton(plugin)
+                Children.Add(new MiniPluginInterface(plugin)
                 {
                     ClickAction = delegate
                     {
@@ -456,20 +456,10 @@ protected UIElement CreateIntControl(PluginParameter parameter)
         }
     }
 
-    public class MiniPluginButton : Button
-    {
-        public MiniPluginButton(IAudioPlugin plugin)
-        {
-            VerticalAlignment = EVerticalAlignment.Stretch;
-
-            MiniPluginInterface pluginInterface = new MiniPluginInterface(plugin);
-
-            PressedElement = UnpressedElement = pluginInterface;
-        }
-    }
-
     public class MiniPluginInterface : PluginInterfaceBase
     {
+        public Action ClickAction { get; set; }
+
         protected float minWidth = 220;
 
         public MiniPluginInterface(IAudioPlugin plugin)
@@ -541,6 +531,19 @@ protected override void AddControls(Dock dock)
                 }
             }
         }
+
+        public override bool HandleTouch(in Touch touch)
+        {
+            if (touch.TouchState == ETouchState.Released)
+            {
+                if (ClickAction != null)
+                    ClickAction();
+
+                return true;
+            }
+
+            return base.HandleTouch(touch);
+        }
     }
 
     public class PluginInterface : PluginInterfaceBase