From 47b8e3e0e37a3b59c3043934a180d47129188afa Mon Sep 17 00:00:00 2001
From: Matt Parker <61717342+MattParkerDev@users.noreply.github.com>
Date: Mon, 25 Aug 2025 18:18:24 +1000
Subject: [PATCH] custom popup

---
 .../Features/Run/RunMenuItem.cs               | 23 +++++++++++++++++++
 .../Features/Run/RunMenuItem.cs.uid           |  1 +
 .../Features/Run/RunMenuItem.tscn             | 21 +++++++++++++++++
 src/SharpIDE.Godot/IdeRoot.cs                 | 23 ++++++++++++++-----
 src/SharpIDE.Godot/IdeRoot.tscn               | 12 +++++++++-
 src/SharpIDE.Godot/Singletons.cs              |  8 +++++++
 src/SharpIDE.Godot/Singletons.cs.uid          |  1 +
 7 files changed, 82 insertions(+), 7 deletions(-)
 create mode 100644 src/SharpIDE.Godot/Features/Run/RunMenuItem.cs
 create mode 100644 src/SharpIDE.Godot/Features/Run/RunMenuItem.cs.uid
 create mode 100644 src/SharpIDE.Godot/Features/Run/RunMenuItem.tscn
 create mode 100644 src/SharpIDE.Godot/Singletons.cs
 create mode 100644 src/SharpIDE.Godot/Singletons.cs.uid

diff --git a/src/SharpIDE.Godot/Features/Run/RunMenuItem.cs b/src/SharpIDE.Godot/Features/Run/RunMenuItem.cs
new file mode 100644
index 0000000..9153907
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Run/RunMenuItem.cs
@@ -0,0 +1,23 @@
+using Godot;
+using SharpIDE.Application.Features.SolutionDiscovery.VsPersistence;
+
+namespace SharpIDE.Godot.Features.Run;
+
+public partial class RunMenuItem : HBoxContainer
+{
+    public SharpIdeProjectModel Project { get; set; } = null!;
+    private Label _label = null!;
+    private Button _runButton = null!;
+    public override void _Ready()
+    {
+        _label = GetNode<Label>("Label");
+        _runButton = GetNode<Button>("RunButton");
+        _runButton.Pressed += OnRunButtonPressed;
+        _label.Text = Project.Name;
+    }
+
+    private async void OnRunButtonPressed()
+    {
+        await Singletons.RunService.RunProject(Project).ConfigureAwait(false);
+    }
+}
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/Run/RunMenuItem.cs.uid b/src/SharpIDE.Godot/Features/Run/RunMenuItem.cs.uid
new file mode 100644
index 0000000..21fa46d
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Run/RunMenuItem.cs.uid
@@ -0,0 +1 @@
+uid://btsnapfx0dlbb
diff --git a/src/SharpIDE.Godot/Features/Run/RunMenuItem.tscn b/src/SharpIDE.Godot/Features/Run/RunMenuItem.tscn
new file mode 100644
index 0000000..8a3de39
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Run/RunMenuItem.tscn
@@ -0,0 +1,21 @@
+[gd_scene load_steps=3 format=3 uid="uid://d2ewm2lajutpv"]
+
+[ext_resource type="Script" uid="uid://btsnapfx0dlbb" path="res://Features/Run/RunMenuItem.cs" id="1_syj0f"]
+[ext_resource type="Texture2D" uid="uid://bnprs1lvjyaji" path="res://Features/Run/Play.png" id="1_xfxpu"]
+
+[node name="RunMenuItem" type="HBoxContainer"]
+offset_right = 40.0
+offset_bottom = 40.0
+script = ExtResource("1_syj0f")
+
+[node name="Label" type="Label" parent="."]
+layout_mode = 2
+text = "Project Name"
+
+[node name="Spacer" type="Control" parent="."]
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="RunButton" type="Button" parent="."]
+layout_mode = 2
+icon = ExtResource("1_xfxpu")
diff --git a/src/SharpIDE.Godot/IdeRoot.cs b/src/SharpIDE.Godot/IdeRoot.cs
index 292e53e..4bc8b5a 100644
--- a/src/SharpIDE.Godot/IdeRoot.cs
+++ b/src/SharpIDE.Godot/IdeRoot.cs
@@ -16,15 +16,24 @@ public partial class IdeRoot : Control
 	private SharpIdeCodeEdit _sharpIdeCodeEdit = null!;
 	private SolutionExplorerPanel _solutionExplorerPanel = null!;
 	private RunPanel _runPanel = null!;
-	private MenuButton _runMenuButton = null!;
+	private Button _runMenuButton = null!;
+	private Popup _runMenuPopup = null!;
+	
+	private readonly PackedScene _runMenuItemScene = ResourceLoader.Load<PackedScene>("res://Features/Run/RunMenuItem.tscn");
 	public override void _Ready()
 	{
 		MSBuildLocator.RegisterDefaults();
 		
 		_openSlnButton = GetNode<Button>("%OpenSlnButton");
-		_runMenuButton = GetNode<MenuButton>("%RunMenuButton");
-		var popup = _runMenuButton.GetPopup();
-		popup.HideOnItemSelection = false;
+		_runMenuPopup = GetNode<Popup>("%RunMenuPopup");
+		_runMenuButton = GetNode<Button>("%RunMenuButton");
+		_runMenuButton.Pressed += () =>
+		{
+			var popupMenuPosition = _runMenuButton.GlobalPosition;
+			const int buttonHeight = 44;
+			_runMenuPopup.Position = new Vector2I((int)popupMenuPosition.X, (int)popupMenuPosition.Y + buttonHeight);
+			_runMenuPopup.Popup();
+		};
 		
 		_sharpIdeCodeEdit = GetNode<SharpIdeCodeEdit>("%SharpIdeCodeEdit");
 		_fileDialog = GetNode<FileDialog>("%OpenSolutionDialog");
@@ -56,10 +65,12 @@ public partial class IdeRoot : Control
 				var runnableProjects = solutionModel.AllProjects.Where(p => p.IsRunnable).ToList();
 				await this.InvokeAsync(() =>
 				{
-					var popup = _runMenuButton.GetPopup();
+					var runMenuPopupVbox = _runMenuPopup.GetNode<VBoxContainer>("VBoxContainer");
 					foreach (var project in runnableProjects)
 					{
-						popup.AddItem(project.Name);
+						var runMenuItem = _runMenuItemScene.Instantiate<RunMenuItem>();
+						runMenuItem.Project = project;
+						runMenuPopupVbox.AddChild(runMenuItem);
 					}
 					_runMenuButton.Disabled = false;
 				});
diff --git a/src/SharpIDE.Godot/IdeRoot.tscn b/src/SharpIDE.Godot/IdeRoot.tscn
index 8066922..c1fb50f 100644
--- a/src/SharpIDE.Godot/IdeRoot.tscn
+++ b/src/SharpIDE.Godot/IdeRoot.tscn
@@ -51,12 +51,21 @@ text = "Open Sln"
 layout_mode = 2
 size_flags_horizontal = 3
 
-[node name="RunMenuButton" type="MenuButton" parent="VBoxContainer/Panel/HBoxContainer"]
+[node name="RunMenuButton" type="Button" parent="VBoxContainer/Panel/HBoxContainer"]
 unique_name_in_owner = true
 layout_mode = 2
+focus_mode = 0
 disabled = true
 icon = ExtResource("2_8x8ub")
 
+[node name="RunMenuPopup" type="Popup" parent="VBoxContainer/Panel/HBoxContainer/RunMenuButton"]
+unique_name_in_owner = true
+size = Vector2i(151, 100)
+
+[node name="VBoxContainer" type="VBoxContainer" parent="VBoxContainer/Panel/HBoxContainer/RunMenuButton/RunMenuPopup"]
+offset_right = 40.0
+offset_bottom = 40.0
+
 [node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"]
 layout_mode = 2
 size_flags_vertical = 3
@@ -106,6 +115,7 @@ auto_brace_completion_highlight_matching = true
 script = ExtResource("2_qjf5e")
 
 [node name="CodeFixesMenu" type="PopupMenu" parent="VBoxContainer/HBoxContainer/VSplitContainer/HSplitContainer/SharpIdeCodeEdit"]
+size = Vector2i(217, 100)
 item_count = 1
 item_0/text = "Getting Context Actions..."
 item_0/id = 0
diff --git a/src/SharpIDE.Godot/Singletons.cs b/src/SharpIDE.Godot/Singletons.cs
new file mode 100644
index 0000000..58e8709
--- /dev/null
+++ b/src/SharpIDE.Godot/Singletons.cs
@@ -0,0 +1,8 @@
+using SharpIDE.Application.Features.Run;
+
+namespace SharpIDE.Godot;
+
+public static class Singletons
+{
+    public static RunService RunService { get; } = new RunService();
+}
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Singletons.cs.uid b/src/SharpIDE.Godot/Singletons.cs.uid
new file mode 100644
index 0000000..690fb39
--- /dev/null
+++ b/src/SharpIDE.Godot/Singletons.cs.uid
@@ -0,0 +1 @@
+uid://hgugdj2v8ufh