Add property viewer to DrawVisualiser

osu.Framework/Graphics/Visualisation/DrawVisualiser.cs

@@ -22,7 +22,6 @@ public class DrawVisualiser : OverlayContainer
         internal readonly PropertyDisplay propertyDisplay;
 
         internal VisualisedDrawable highlighted;
-        private Box highlightMarker;
 
         private readonly InfoOverlay overlay;
         private ScheduledDelegate task;
@@ -49,14 +48,55 @@ public DrawVisualiser()
                     ChooseTarget = chooseTarget,
                     GoUpOneParent = delegate
                     {
+                        Drawable lastHighlight = highlighted?.Target;
+
                         var parent = Target?.Parent;
                         if (parent?.Parent != null)
                             Target = (Drawable)Target?.Parent;
+
+                        // Rehighlight the last highlight
+                        if (lastHighlight != null)
+                        {
+                            VisualisedDrawable visualised = findVisualised(lastHighlight, targetDrawable);
+                            if (visualised != null)
+                                setHighlight(visualised);
+                        }
+                    },
+                    ToggleProperties = delegate
+                    {
+                        propertyDisplay.ToggleVisibility();
+
+                        if (propertyDisplay.State == Visibility.Visible)
+                            setHighlight(targetDrawable);
                     },
-                    ToggleProperties = propertyDisplay.ToggleVisibility,
                 },
                 new CursorContainer()
             };
+
+            propertyDisplay.StateChanged += (display, visibility) =>
+            {
+                switch (visibility)
+                {
+                    case Visibility.Hidden:
+                        setHighlight(null);
+                        break;
+                }
+            };
+        }
+
+        private VisualisedDrawable findVisualised(Drawable d, VisualisedDrawable root)
+        {
+            foreach (VisualisedDrawable child in root.Flow.InternalChildren)
+            {
+                if (child.Target == d)
+                    return child;
+
+                VisualisedDrawable found = findVisualised(d, child);
+                if (found != null)
+                    return found;
+            }
+
+            return null;
         }
 
         protected override bool BlockPassThroughMouse => false;
@@ -87,10 +127,10 @@ protected override void PopOut()
 
         private void chooseTarget()
         {
+            setHighlight(null);
+
             Target = null;
             targetSearching = true;
-
-            propertyDisplay.State = Visibility.Hidden;
         }
 
         private Drawable findTargetIn(Drawable d, InputState state)
@@ -145,6 +185,8 @@ private void removeRootVisualisedDrawable()
         private void createRootVisualisedDrawable()
         {
             removeRootVisualisedDrawable();
+            setHighlight(null);
+
             if (target != null)
             {
                 targetDrawable = createVisualisedDrawable(null, target as Drawable);
@@ -155,8 +197,6 @@ private void createRootVisualisedDrawable()
                 // Update property viewer
                 setHighlight(targetDrawable);
             }
-
-            propertyDisplay.State = Visibility.Visible;
         }
 
         private Drawable target;
@@ -182,8 +222,12 @@ private void updatePropertyDisplay(Drawable d)
             propertyDisplay.Clear(true);
 
             if (d == null)
+            {
+                propertyDisplay.State = Visibility.Hidden;
                 return;
+            }
 
+            propertyDisplay.State = Visibility.Visible;
             Type type = d.GetType();
 
             propertyDisplay.Add(
@@ -223,22 +267,20 @@ private VisualisedDrawable createVisualisedDrawable(VisualisedDrawable parent, D
         }
         private void setHighlight(VisualisedDrawable newHighlight)
         {
-            // Remove marker from previous highlight
-            if (highlightMarker != null && highlightMarker.Parent != null)
-                ((IContainerCollection<Drawable>)highlightMarker.Parent).Remove(highlightMarker);
+            highlighted?.highlightBackground.FadeOut();
 
-            highlightMarker = new Box()
+            if (newHighlight == null)
             {
-                RelativeSizeAxes = Axes.Both,
-                Alpha = 0.4f,
-                Colour = Color4.Khaki
-            };
-            newHighlight.Add(highlightMarker);
-
-            newHighlight.Expand();
+                updatePropertyDisplay(null);
+                highlighted = null;
+                return;
+            }
 
-            highlighted = newHighlight;
             updatePropertyDisplay(newHighlight.Target);
+            highlighted = newHighlight;
+
+            newHighlight.highlightBackground.FadeIn();
+            newHighlight.Expand();
         }
 
         private void visualise(IDrawable d, VisualisedDrawable vis)

osu.Framework/Graphics/Visualisation/PropertyDisplay.cs

@@ -94,60 +94,91 @@ internal class PropertyItem : ClickableContainer
     {
         private readonly SpriteText nameText;
         private readonly SpriteText valueText;
+        private readonly Box changeMarker;
 
         private readonly Box box;
         private readonly Func<string> getValue;     // Use delegate for performance
 
         public PropertyItem(MemberInfo info, IDrawable d)
         {
-            try
-            {
                 switch (info.MemberType)
                 {
                     case MemberTypes.Property:
-                        getValue = ((PropertyInfo)info).GetValue(d).ToString;
+                        getValue = () => ((PropertyInfo)info).GetValue(d)?.ToString();
                         break;
 
                     case MemberTypes.Field:
-                        getValue = ((FieldInfo)info).GetValue(d).ToString;
+                        getValue = () => ((FieldInfo)info).GetValue(d)?.ToString();
                         break;
                 }
-            }
-            catch
-            {
-                getValue = () => @"<Cannot evaluate>";
-            }
 
             RelativeSizeAxes = Axes.X;
             Height = 20f;
             AddInternal(new Drawable[]
             {
-                box = new Box()
+                new Container()
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = Color4.White,
-                    Alpha = 0f
-                },
-                nameText = new SpriteText()
-                {
-                    Text = info.Name,
-                    TextSize = Height
+                    Padding = new MarginPadding()
+                    {
+                        Right = 6
+                    },
+                    Children = new Drawable[]
+                    {
+                        box = new Box()
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = Color4.White,
+                            Alpha = 0f
+                        },
+                        nameText = new SpriteText()
+                        {
+                            Text = info.Name,
+                            TextSize = Height
+                        },
+                        valueText = new SpriteText()
+                        {
+                            Anchor = Anchor.TopRight,
+                            Origin = Anchor.TopRight,
+                            TextSize = Height
+                        },
+                    }
                 },
-                valueText = new SpriteText()
+                changeMarker = new Box()
                 {
-                    Anchor = Anchor.TopRight,
-                    Origin = Anchor.TopRight,
-                    TextSize = Height
+                    Size = new Vector2(4, 18),
+                    Anchor = Anchor.CentreRight,
+                    Origin = Anchor.CentreRight,
+                    Colour = Color4.Red
                 }
             });
         }
 
+        private string lastValue;
+
         protected override void Update()
         {
             base.Update();
 
             // Update value
-            valueText.Text = getValue();
+            string value;
+            try
+            {
+                value = getValue();
+            }
+            catch
+            {
+                value = @"<Cannot evaluate>";
+            }
+
+            if (value != lastValue)
+            {
+                changeMarker.ClearTransforms();
+                changeMarker.Alpha = 0.8f;
+                changeMarker.FadeOut(200);
+            }
+
+            valueText.Text = lastValue = value;
         }
 
         protected override bool OnHover(InputState state)

osu.Framework/Graphics/Visualisation/VisualisedDrawable.cs

@@ -32,6 +32,7 @@ public int Compare(VisualisedDrawable x, VisualisedDrawable y)
         public Drawable Target { get; }
 
         private readonly Box background;
+        internal readonly Box highlightBackground;
         private readonly SpriteText text;
         private readonly Drawable previewBox;
         private readonly Drawable activityInvalidate;
@@ -111,6 +112,15 @@ public VisualisedDrawable(VisualisedDrawable parent, Drawable d, DrawVisualiser
                             Origin = Anchor.CentreLeft,
                             Colour = Color4.Transparent,
                         },
+                        highlightBackground = new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Size = new Vector2(1, 0.8f),
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                            Colour = Color4.Khaki.Opacity(0.4f),
+                            Alpha = 0
+                        },
                         text = new SpriteText
                         {
                             Scale = new Vector2(0.9f),
@@ -180,7 +190,10 @@ protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
         {
             if (state.Mouse.IsPressed(MouseButton.Right))
             {
-                HighlightTarget?.Invoke(this);
+                if (viz.highlighted == this)
+                    HighlightTarget?.Invoke(null);
+
+                else HighlightTarget?.Invoke(this);
                 return true;
             }