Add property viewer to DrawVisualiser

osu.Framework/Audio/AudioManager.cs

@@ -11,6 +11,7 @@
 using osu.Framework.Threading;
 using System.Linq;
 using System.Diagnostics;
+using osu.Framework.Extensions.TypeExtensions;
 
 namespace osu.Framework.Audio
 {
@@ -371,5 +372,7 @@ private void checkAudioDeviceChanged()
             {
             }
         }
+
+        public override string ToString() => $@"{GetType().ReadableName()} ({currentAudioDevice})";
     }
 }

osu.Framework/Graphics/Colour/ColourInfo.cs

@@ -197,6 +197,14 @@ public float MaxAlpha
             }
         }
 
+        public override string ToString()
+        {
+            if (HasSingleColour)
+                return $@"{TopLeft} (Single)";
+
+            else return $@"{TopLeft}, {TopRight}, {BottomLeft}, {BottomRight}";
+        }
+
         public static implicit operator ColourInfo(SRGBColour colour) => SingleColour(colour);
         public static implicit operator ColourInfo(Color4 colour) => (SRGBColour)colour;
     }

osu.Framework/Graphics/Colour/SRGBColour.cs

@@ -45,5 +45,6 @@ public struct SRGBColour : IEquatable<SRGBColour>
         public void MultiplyAlpha(float alpha) => Linear.A *= alpha;
 
         public bool Equals(SRGBColour other) => Linear.Equals(other.Linear);
+        public override string ToString() => Linear.ToString();
     }
 }

osu.Framework/Graphics/Containers/ContainerDrawNode.cs

@@ -67,6 +67,8 @@ public struct EdgeEffect : IEquatable<EdgeEffect>
             Type == other.Type &&
             Roundness == other.Roundness &&
             Radius == other.Radius;
+
+        public override string ToString() => $@"{Radius} {Type}EdgeEffect";
     }
 
     /// <summary>

osu.Framework/Graphics/DrawInfo.cs

@@ -6,6 +6,7 @@
 using OpenTK;
 using OpenTK.Graphics;
 using osu.Framework.Graphics.Colour;
+using osu.Framework.Extensions.TypeExtensions;
 
 namespace osu.Framework.Graphics
 {
@@ -77,5 +78,7 @@ public bool Equals(DrawInfo other)
         {
             return Matrix.Equals(other.Matrix) && Colour.Equals(other.Colour) && Blending.Equals(other.Blending);
         }
+
+        public override string ToString() => $@"{GetType().ReadableName().Replace(@"DrawInfo", string.Empty)} DrawInfo";
     }
 }

osu.Framework/Graphics/MarginPadding.cs

@@ -43,6 +43,8 @@ public bool Equals(MarginPadding other)
             return Top == other.Top && Left == other.Left && Bottom == other.Bottom && Right == other.Right;
         }
 
+        public override string ToString() => $@"({Top}, {Left}, {Bottom}, {Right})";
+
         public static MarginPadding operator -(MarginPadding mp)
         {
             return new MarginPadding

osu.Framework/Graphics/Primitives/RectangleF.cs

@@ -7,6 +7,7 @@
 using System.Globalization;
 using System.Runtime.InteropServices;
 using OpenTK;
+using osu.Framework.MathUtils;
 
 namespace osu.Framework.Graphics.Primitives
 {
@@ -354,9 +355,10 @@ internal float DistanceSquared(Vector2 localSpacePos)
         /// <returns>A string that contains the position, width, and height of this <see cref="T:System.Drawing.RectangleF"></see> structure¾for example, "{X=20, Y=20, Width=100, Height=50}".</returns>
         /// <filterpriority>1</filterpriority>
         /// <PermissionSet><IPermission class="System.Security.Permissions.SecurityPermission, mscorlib, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" version="1" Flags="UnmanagedCode" /></PermissionSet>
-        public override string ToString() => "{X=" + X.ToString(CultureInfo.CurrentCulture) + ",Y=" + Y.ToString(CultureInfo.CurrentCulture) +
-                                             ",Width=" + Width.ToString(CultureInfo.CurrentCulture) + ",Height=" +
-                                             Height.ToString(CultureInfo.CurrentCulture) + "}";
+        public override string ToString() => $"X={Math.Round(X, 3).ToString(CultureInfo.CurrentCulture)}, "
+                                           + $"Y={Math.Round(Y, 3).ToString(CultureInfo.CurrentCulture)}, "
+                                           + $"Width={Math.Round(Width, 3).ToString(CultureInfo.CurrentCulture)}, "
+                                           + $"Height={Math.Round(Height, 3).ToString(CultureInfo.CurrentCulture)}";
 
         static RectangleF()
         {

osu.Framework/Graphics/Shaders/Shader.cs

@@ -168,6 +168,8 @@ public void Unbind()
             IsBound = false;
         }
 
+        public override string ToString() => $@"{name} Shader (Compiled: {programID != -1})";
+
         /// <summary>
         /// Returns a uniform from the shader.
         /// </summary>

osu.Framework/Graphics/Textures/Texture.cs

@@ -202,6 +202,8 @@ public void DrawQuad(Quad vertexQuad, ColourInfo colour, RectangleF? textureRect
 
             TextureGL.DrawQuad(vertexQuad, TextureBounds(textureRect), colour, vertexAction, inflationPercentage, blendRangeOverride);
         }
+
+        public override string ToString() => $@"{AssetName} ({Width}, {Height})";
     }
 
     public class TextureWhitePixel : Texture

osu.Framework/Graphics/Visualisation/DrawVisualiser.cs

@@ -8,12 +8,20 @@
 using osu.Framework.Input;
 using osu.Framework.Threading;
 using osu.Framework.Lists;
+using System;
+using System.Reflection;
+using System.Collections.Generic;
+using OpenTK.Graphics;
+using OpenTK;
 
 namespace osu.Framework.Graphics.Visualisation
 {
     public class DrawVisualiser : OverlayContainer
     {
-        private readonly TreeContainer treeContainer;
+        internal readonly TreeContainer treeContainer;
+        internal readonly PropertyDisplay propertyDisplay;
+
+        internal VisualisedDrawable highlighted;
 
         private readonly InfoOverlay overlay;
         private ScheduledDelegate task;
@@ -26,20 +34,72 @@ public DrawVisualiser()
             RelativeSizeAxes = Axes.Both;
             Children = new Drawable[]
             {
-                overlay = new InfoOverlay(),
+                overlay = new InfoOverlay()
+                {
+                    Depth = float.MaxValue
+                },
+                propertyDisplay = new PropertyDisplay
+                {
+                    Depth = float.MinValue
+                },
                 treeContainer = new TreeContainer
                 {
-                    Depth = float.MinValue,
+                    Depth = 0f, // Below property display
                     ChooseTarget = chooseTarget,
                     GoUpOneParent = delegate
                     {
+                        Drawable lastHighlight = highlighted?.Target;
+
                         var parent = Target?.Parent;
                         if (parent?.Parent != null)
-                            Target = Target?.Parent;
-                    }
+                            Target = (Drawable)Target?.Parent;
+
+                        // Rehighlight the last highlight
+                        if (lastHighlight != null)
+                        {
+                            VisualisedDrawable visualised = findVisualised(lastHighlight, targetDrawable);
+                            if (visualised != null)
+                                setHighlight(visualised);
+                        }
+                    },
+                    ToggleProperties = delegate
+                    {
+                        if (targetDrawable == null)
+                            return;
+
+                        propertyDisplay.ToggleVisibility();
+
+                        if (propertyDisplay.State == Visibility.Visible)
+                            setHighlight(targetDrawable);
+                    },
                 },
                 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;
@@ -70,6 +130,9 @@ protected override void PopOut()
 
         private void chooseTarget()
         {
+            setHighlight(null);
+            propertyDisplay.State = Visibility.Hidden;
+
             Target = null;
             targetSearching = true;
         }
@@ -78,6 +141,7 @@ private Drawable findTargetIn(Drawable d, InputState state)
         {
             if (d is DrawVisualiser) return null;
             if (d is CursorContainer) return null;
+            if (d is PropertyDisplay) return null;
 
             if (!d.IsPresent) return null;
 
@@ -132,18 +196,23 @@ private void removeRootVisualisedDrawable()
         private void createRootVisualisedDrawable()
         {
             removeRootVisualisedDrawable();
+            setHighlight(null);
+
             if (target != null)
             {
                 targetDrawable = createVisualisedDrawable(null, target as Drawable);
                 treeContainer.Add(targetDrawable);
 
                 runUpdate(); // run an initial update to immediately show the selected hierarchy.
+
+                // Set highlight and update
+                setHighlight(targetDrawable);
             }
         }
 
-        private IDrawable target;
+        private Drawable target;
 
-        public IDrawable Target
+        public Drawable Target
         {
             get { return target; }
             set
@@ -159,6 +228,21 @@ private void runUpdate()
 
             visualise(Target, targetDrawable);
         }
+        private void updatePropertyDisplay(Drawable d)
+        {
+            propertyDisplay.Clear(true);
+
+            if (d == null)
+                return;
+
+            Type type = d.GetType();
+
+            propertyDisplay.Add(
+                ((IEnumerable<MemberInfo>)type.GetProperties(BindingFlags.Instance | BindingFlags.Public))      // Get all properties
+                .Concat(type.GetFields(BindingFlags.Instance | BindingFlags.Public))                            // And all fields
+                .OrderBy(member => member.Name)
+                .Select(member => new PropertyItem(member, d)));
+        }
 
         private void updateHoveredDrawable()
         {
@@ -167,9 +251,10 @@ private void updateHoveredDrawable()
 
         private VisualisedDrawable createVisualisedDrawable(VisualisedDrawable parent, Drawable target)
         {
-            var vis = new VisualisedDrawable(parent, target, treeContainer)
+            var vis = new VisualisedDrawable(parent, target, this)
             {
-                RequestTarget = delegate { Target = target; }
+                RequestTarget = delegate { Target = target; },
+                HighlightTarget = setHighlight
             };
 
             vis.HoverGained = delegate
@@ -186,6 +271,26 @@ private VisualisedDrawable createVisualisedDrawable(VisualisedDrawable parent, D
 
             return vis;
         }
+        private void setHighlight(VisualisedDrawable newHighlight)
+        {
+            highlighted?.highlightBackground.FadeOut();
+
+            if (newHighlight == null)
+            {
+                updatePropertyDisplay(null);
+                highlighted = null;
+                return;
+            }
+
+            updatePropertyDisplay(newHighlight.Target);
+            highlighted = newHighlight;
+
+            if (propertyDisplay.State == Visibility.Visible)
+            {
+                newHighlight.highlightBackground.FadeIn();
+                newHighlight.Expand();
+            }
+        }
 
         private void visualise(IDrawable d, VisualisedDrawable vis)
         {
@@ -232,7 +337,7 @@ protected override bool OnClick(InputState state)
         {
             if (targetSearching)
             {
-                Target = findTarget(state)?.Parent;
+                Target = (Drawable)findTarget(state)?.Parent;
 
                 if (Target != null)
                 {