github/SharpIDE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
Matt Parker
2025-12-18 14:14:20 +10:00
parent 2a69d17078
commit 759c7405fb
4 changed files with 42 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/SharpIDE.Godot/Features/CodeEditor/SharpIdeCodeEdit.SelectionChanged.cs.uid Normal file
View File

@@ -0,0 +1 @@
uid://b7whlycv5lu0t

38
src/SharpIDE.Godot/Features/Debug_/Tab/SubTabs/ThreadsVariablesSubTab.DebuggerVariableCustomDraw.cs Normal file
View File

@@ -0,0 +1,38 @@
using Godot;
namespace SharpIDE.Godot.Features.Debug_.Tab.SubTabs;
public partial class ThreadsVariablesSubTab
{
private static readonly Color VariableNameColor = new Color("f0ac81");
private static readonly Color VariableWhiteColor = new Color("d4d4d4");
private static readonly Color VariableTypeColor = new Color("70737a");
private void DebuggerVariableCustomDraw(TreeItem treeItem, Rect2 rect)
{
var variable = _variableReferenceLookup.GetValueOrDefault(treeItem);
if (variable is null) return;
var font = _variablesTree.GetThemeFont(ThemeStringNames.Font);
var fontSize = _variablesTree.GetThemeFontSize(ThemeStringNames.FontSize);
const float padding = 4.0f;
var currentX = rect.Position.X + padding;
var textYPos = rect.Position.Y + (rect.Size.Y + fontSize) / 2 - 2;
_variablesTree.DrawString(font, new Vector2(currentX, textYPos), variable.Name, HorizontalAlignment.Left, -1,
fontSize, VariableNameColor);
var variableNameDrawnSize = font.GetStringSize(variable.Name, HorizontalAlignment.Left, -1, fontSize).X;
currentX += variableNameDrawnSize;
_variablesTree.DrawString(font, new Vector2(currentX, textYPos), " = ", HorizontalAlignment.Left, -1, fontSize,
VariableWhiteColor);
currentX += font.GetStringSize(" = ", HorizontalAlignment.Left, -1, fontSize).X;
_variablesTree.DrawString(font, new Vector2(currentX, textYPos), $"{{{variable.Type}}} ",
HorizontalAlignment.Left, -1, fontSize, VariableTypeColor);
var variableTypeDrawnSize =
font.GetStringSize($"{{{variable.Type}}} ", HorizontalAlignment.Left, -1, fontSize).X;
currentX += variableTypeDrawnSize;
_variablesTree.DrawString(font, new Vector2(currentX, textYPos), variable.Value, HorizontalAlignment.Left, -1,
fontSize, VariableWhiteColor);
}
}

1
src/SharpIDE.Godot/Features/Debug_/Tab/SubTabs/ThreadsVariablesSubTab.DebuggerVariableCustomDraw.cs.uid Normal file
View File

@@ -0,0 +1 @@
uid://nsu1apfuftmd

29
src/SharpIDE.Godot/Features/Debug_/Tab/SubTabs/ThreadsVariablesSubTab.cs
View File

@@ -26,7 +26,7 @@ public partial class ThreadsVariablesSubTab : Control
[Inject] private readonly RunService _runService = null!; [Inject] private readonly RunService _runService = null!;
private Callable? _debuggerVariableCustomDrawCallable; private Callable? _debuggerVariableCustomDrawCallable;
private Dictionary<TreeItem, Variable> _variableReferenceLookup = []; // primarily used for DebuggerVariableCustomDraw private readonly Dictionary<TreeItem, Variable> _variableReferenceLookup = []; // primarily used for DebuggerVariableCustomDraw
public override void _Ready() public override void _Ready()
{ {
@@ -42,32 +42,6 @@ public partial class ThreadsVariablesSubTab : Control
Project.ProjectStoppedRunning.Subscribe(ClearAllTrees); Project.ProjectStoppedRunning.Subscribe(ClearAllTrees);
} }
private static readonly Color VariableNameColor = new Color("f0ac81");
private static readonly Color VariableWhiteColor = new Color("d4d4d4");
private static readonly Color VariableTypeColor = new Color("70737a");
private void DebuggerVariableCustomDraw(TreeItem treeItem, Rect2 rect)
{
var variable = _variableReferenceLookup.GetValueOrDefault(treeItem);
if (variable is null) return;
var font = _variablesTree.GetThemeFont(ThemeStringNames.Font);
var fontSize = _variablesTree.GetThemeFontSize(ThemeStringNames.FontSize);
const float padding = 4.0f;
var currentX = rect.Position.X + padding;
var textYPos = rect.Position.Y + (rect.Size.Y + fontSize) / 2 - 2;
_variablesTree.DrawString(font, new Vector2(currentX, textYPos), variable.Name, HorizontalAlignment.Left, -1, fontSize, VariableNameColor);
var variableNameDrawnSize = font.GetStringSize(variable.Name, HorizontalAlignment.Left, -1, fontSize).X;
currentX += variableNameDrawnSize;
_variablesTree.DrawString(font, new Vector2(currentX, textYPos), " = ", HorizontalAlignment.Left, -1, fontSize, VariableWhiteColor);
currentX += font.GetStringSize(" = ", HorizontalAlignment.Left, -1, fontSize).X;
_variablesTree.DrawString(font, new Vector2(currentX, textYPos), $"{{{variable.Type}}} ", HorizontalAlignment.Left, -1, fontSize, VariableTypeColor);
var variableTypeDrawnSize = font.GetStringSize($"{{{variable.Type}}} ", HorizontalAlignment.Left, -1, fontSize).X;
currentX += variableTypeDrawnSize;
_variablesTree.DrawString(font, new Vector2(currentX, textYPos), variable.Value, HorizontalAlignment.Left, -1, fontSize, VariableWhiteColor);
}
private void OnVariablesItemExpandedOrCollapsed(TreeItem item) private void OnVariablesItemExpandedOrCollapsed(TreeItem item)
{ {
var wasExpanded = item.IsCollapsed() is false; var wasExpanded = item.IsCollapsed() is false;
@@ -110,6 +84,7 @@ public partial class ThreadsVariablesSubTab : Control
_threadsTree.Clear(); _threadsTree.Clear();
_stackFramesTree.Clear(); _stackFramesTree.Clear();
_variablesTree.Clear(); _variablesTree.Clear();
_variableReferenceLookup.Clear();
}); });
} }