Port PersonPicture control from WinUI

Kinnara · Jan 14, 2020 · 99523fd · 99523fd
1 parent ece5abc
commit 99523fd
Show file tree

Hide file tree

Showing 27 changed files with 2,437 additions and 8 deletions.
diff --git a/ModernWpf.Controls/Common/SharedHelpers.cs b/ModernWpf.Controls/Common/SharedHelpers.cs
@@ -119,6 +119,11 @@ public static Window GetActiveWindow()
         }
 
         public static string SafeSubstring(this string s, int startIndex)
+        {
+            return s.SafeSubstring(startIndex, s.Length - startIndex);
+        }
+
+        public static string SafeSubstring(this string s, int startIndex, int length)
         {
             if (s is null)
             {
@@ -130,7 +135,12 @@ public static string SafeSubstring(this string s, int startIndex)
                 return string.Empty;
             }
 
-            return s.Substring(startIndex);
+            if (length > s.Length - startIndex)
+            {
+                length = s.Length - startIndex;
+            }
+
+            return s.Substring(startIndex, length);
         }
 
         public static bool IndexOf(this UIElementCollection collection, UIElement element, out int index)

diff --git a/ModernWpf.Controls/DropDownButton/DropDownButtonAutomationPeer.cs b/ModernWpf.Controls/DropDownButton/DropDownButtonAutomationPeer.cs
@@ -26,7 +26,7 @@ public override object GetPattern(PatternInterface patternInterface)
 
         protected override string GetClassNameCore()
         {
-            return nameof(DropDownButton);
+            return typeof(DropDownButton).FullName;
         }
 
         private DropDownButton GetImpl()

diff --git a/ModernWpf.Controls/NumberBox/NumberBoxAutomationPeer.cs b/ModernWpf.Controls/NumberBox/NumberBoxAutomationPeer.cs
@@ -1,4 +1,7 @@
-using System.Windows.Automation;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using System.Windows.Automation;
 using System.Windows.Automation.Peers;
 using System.Windows.Automation.Provider;
 using ModernWpf.Controls;
@@ -23,7 +26,7 @@ public override object GetPattern(PatternInterface patternInterface)
 
         protected override string GetClassNameCore()
         {
-            return nameof(NumberBox);
+            return typeof(NumberBox).FullName;
         }
 
         protected override AutomationControlType GetAutomationControlTypeCore()