Merge pull request #6176 from pr8x/more-to-strin-devtools

Adding more ToString() overloads to improve DevTools
AvaloniaUI · Jul 2, 2021 · c1ef23f · c1ef23f
2 parents 34e0a27 + c5f6fbc
commit c1ef23f
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 3 deletions.
diff --git a/src/Avalonia.Controls/RowDefinitions.cs b/src/Avalonia.Controls/RowDefinitions.cs
@@ -1,5 +1,4 @@
 using System.Linq;
-using Avalonia.Collections;
 
 namespace Avalonia.Controls
 {
@@ -25,11 +24,16 @@ public RowDefinitions(string s)
             AddRange(GridLength.ParseLengths(s).Select(x => new RowDefinition(x)));
         }
 
+        public override string ToString()
+        {
+            return string.Join(",", this.Select(x => x.Height));
+        }
+
         /// <summary>
         /// Parses a string representation of row definitions collection.
         /// </summary>
         /// <param name="s">The row definitions string.</param>
         /// <returns>The <see cref="RowDefinitions"/>.</returns>
         public static RowDefinitions Parse(string s) => new RowDefinitions(s);
     }
-}
+}
diff --git a/src/Avalonia.Visuals/Media/BoxShadow.cs b/src/Avalonia.Visuals/Media/BoxShadow.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Globalization;
+using System.Text;
 using Avalonia.Animation.Animators;
 using Avalonia.Utilities;
 
@@ -75,6 +76,46 @@ public string ReadString()
                 return rv;
             }
         }
+
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+
+            if (IsEmpty)
+            {
+                return "none";
+            }
+
+            if (IsInset)
+            {
+                sb.Append("inset");
+            }
+
+            if (OffsetX != 0.0)
+            {
+                sb.AppendFormat(" {0}", OffsetX.ToString());
+            }
+
+            if (OffsetY != 0.0)
+            {
+                sb.AppendFormat(" {0}", OffsetY.ToString());
+            }
+
+            if (Blur != 0.0)
+            {
+                sb.AppendFormat(" {0}", Blur.ToString());
+            }
+
+            if (Spread != 0.0)
+            {
+                sb.AppendFormat(" {0}", Spread.ToString());
+            }
+
+            sb.AppendFormat(" {0}", Color.ToString());
+
+            return sb.ToString();
+        }
+
         public static unsafe BoxShadow Parse(string s)
         {
             if(s == null)

diff --git a/src/Avalonia.Visuals/Media/BoxShadows.cs b/src/Avalonia.Visuals/Media/BoxShadows.cs
@@ -1,6 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
+using System.Text;
 using Avalonia.Animation.Animators;
 
 namespace Avalonia.Media
@@ -43,6 +43,24 @@ public BoxShadows(BoxShadow first, BoxShadow[] rest)
             }
         }
 
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+
+            if (Count == 0)
+            {
+                return "none";
+            }
+
+            foreach (var boxShadow in this)
+            {
+                sb.AppendFormat("{0} ", boxShadow.ToString());
+            }
+
+            return sb.ToString();
+
+        }
+
         [EditorBrowsable(EditorBrowsableState.Never)]
         public struct BoxShadowsEnumerator
         {