Debugger: Tilemap viewer - Fixed crash caused by the new separators i…

…n tooltips
SourMesen · Jul 1, 2024 · 990b99f · 990b99f
1 parent ed4d97b
commit 990b99f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/UI/Debugger/Controls/DynamicTooltip.axaml b/UI/Debugger/Controls/DynamicTooltip.axaml
@@ -27,7 +27,12 @@
 
 	<UserControl.DataTemplates>
 		<DataTemplate DataType="dc:TooltipSeparator">
-			<Rectangle Height="1" Fill="{StaticResource MesenGrayBorderColor}" Margin="5 3" />
+			<Rectangle
+				Height="1"
+				Fill="{StaticResource MesenGrayBorderColor}"
+				Margin="5 3"
+				IsVisible="{Binding !Hidden}"
+			/>
 		</DataTemplate>
 
 		<DataTemplate DataType="dc:CustomTooltipEntry">

diff --git a/UI/Debugger/Controls/DynamicTooltip.axaml.cs b/UI/Debugger/Controls/DynamicTooltip.axaml.cs
@@ -116,6 +116,8 @@ public CustomTooltipEntry(string name, object value, bool useMonoFont = false) :
 
 	public class TooltipSeparator : TooltipEntry
 	{
+		[Reactive] public bool Hidden { get; set; } = false;
+
 		public TooltipSeparator(string name) : base(name, false, false)
 		{
 		}
@@ -176,12 +178,7 @@ public void AddCustomEntry(string name, Control value)
 
 		public void AddSeparator(string name)
 		{
-			if(this.Count > _updatedKeys.Count - 1 && this[_updatedKeys.Count - 1] is TooltipSeparator) {
-				return;
-			}
-
 			_updatedKeys.Add(name);
-
 			if(!_entries.TryGetValue(name, out _)) {
 				TooltipEntry? entry = new TooltipSeparator(name);
 				_entries[name] = entry;
@@ -231,8 +228,13 @@ public void EndUpdate()
 				}
 			}
 
-			while(this.Count > 0 && this[^1] is TooltipSeparator) {
-				RemoveAt(this.Count - 1);
+			for(int i = 0; i < Count; i++) {
+				if(this[i] is TooltipSeparator sep) {
+					bool hideSeparator = (i < Count - 1 && this[i + 1] is TooltipSeparator) || i == Count - 1;
+					if(sep.Hidden != hideSeparator) {
+						sep.Hidden = hideSeparator;
+					}
+				}
 			}
 
 			if(updated) {