Merge branch 'master' into feature/mvvm-toolkit-part2

Sergio0694 · web-flow · commit 76e1d1775154 · 2020-08-06T14:21:12.000+02:00
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridAutomationPeer.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-// #define DEBUG_AUTOMATION
 using System.Collections.Generic;
 using System.Diagnostics;
 using Microsoft.Toolkit.Uwp.UI.Controls;
@@ -184,7 +183,11 @@ protected override IList<AutomationPeer> GetChildrenCore()
         /// <returns>The string that contains the name.</returns>
         protected override string GetClassNameCore()
         {
-            return Owner.GetType().Name;
+            string classNameCore = Owner.GetType().Name;
+#if DEBUG_AUTOMATION
+            Debug.WriteLine("DataGridAutomationPeer.GetClassNameCore returns " + classNameCore);
+#endif
+            return classNameCore;
         }
 
         /// <summary>
@@ -212,6 +215,10 @@ protected override string GetNameCore()
                 }
             }
 
+#if DEBUG_AUTOMATION
+            Debug.WriteLine("DataGridAutomationPeer.GetNameCore returns " + name);
+#endif
+
             return name;
         }
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridCellAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridCellAutomationPeer.cs
@@ -107,7 +107,11 @@ protected override AutomationControlType GetAutomationControlTypeCore()
         /// <returns>The string that contains the name.</returns>
         protected override string GetClassNameCore()
         {
-            return Owner.GetType().Name;
+            string classNameCore = Owner.GetType().Name;
+#if DEBUG_AUTOMATION
+            System.Diagnostics.Debug.WriteLine("DataGridCellAutomationPeer.GetClassNameCore returns " + classNameCore);
+#endif
+            return classNameCore;
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridColumnHeaderAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridColumnHeaderAutomationPeer.cs
@@ -50,7 +50,11 @@ protected override AutomationControlType GetAutomationControlTypeCore()
         /// <returns>The string that contains the name.</returns>
         protected override string GetClassNameCore()
         {
-            return Owner.GetType().Name;
+            string classNameCore = Owner.GetType().Name;
+#if DEBUG_AUTOMATION
+            System.Diagnostics.Debug.WriteLine("DataGridColumnHeaderAutomationPeer.GetClassNameCore returns " + classNameCore);
+#endif
+            return classNameCore;
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridColumnHeadersPresenterAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridColumnHeadersPresenterAutomationPeer.cs
@@ -37,7 +37,11 @@ protected override AutomationControlType GetAutomationControlTypeCore()
         /// <returns>The string that contains the name.</returns>
         protected override string GetClassNameCore()
         {
-            return Owner.GetType().Name;
+            string classNameCore = Owner.GetType().Name;
+#if DEBUG_AUTOMATION
+            System.Diagnostics.Debug.WriteLine("DataGridColumnHeadersPresenterAutomationPeer.GetClassNameCore returns " + classNameCore);
+#endif
+            return classNameCore;
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridDetailsPresenterAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridDetailsPresenterAutomationPeer.cs
@@ -37,7 +37,11 @@ protected override AutomationControlType GetAutomationControlTypeCore()
         /// <returns>The string that contains the name.</returns>
         protected override string GetClassNameCore()
         {
-            return this.Owner.GetType().Name;
+            string classNameCore = Owner.GetType().Name;
+#if DEBUG_AUTOMATION
+            System.Diagnostics.Debug.WriteLine("DataGridDetailsPresenterAutomationPeer.GetClassNameCore returns " + classNameCore);
+#endif
+            return classNameCore;
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridGroupItemAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridGroupItemAutomationPeer.cs
@@ -200,7 +200,11 @@ protected override IList<AutomationPeer> GetChildrenCore()
         /// <returns>The string that contains the name.</returns>
         protected override string GetClassNameCore()
         {
-            return this.OwningRowGroupHeaderPeer != null ? this.OwningRowGroupHeaderPeer.GetClassName() : string.Empty;
+            string classNameCore = this.OwningRowGroupHeaderPeer != null ? this.OwningRowGroupHeaderPeer.GetClassName() : string.Empty;
+#if DEBUG_AUTOMATION
+            Debug.WriteLine("DataGridGroupItemAutomationPeer.GetClassNameCore returns " + classNameCore);
+#endif
+            return classNameCore;
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridItemAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridItemAutomationPeer.cs
@@ -151,7 +151,11 @@ protected override IList<AutomationPeer> GetChildrenCore()
         /// <returns>The string that contains the name.</returns>
         protected override string GetClassNameCore()
         {
-            return (this.OwningRowPeer != null) ? this.OwningRowPeer.GetClassName() : string.Empty;
+            string classNameCore = (this.OwningRowPeer != null) ? this.OwningRowPeer.GetClassName() : string.Empty;
+#if DEBUG_AUTOMATION
+            System.Diagnostics.Debug.WriteLine("DataGridItemAutomationPeer.GetClassNameCore returns " + classNameCore);
+#endif
+            return classNameCore;
         }
 
         /// <summary>
@@ -219,11 +223,18 @@ protected override string GetNameCore()
                 string owningRowPeerName = this.OwningRowPeer.GetName();
                 if (!string.IsNullOrEmpty(owningRowPeerName))
                 {
+#if DEBUG_AUTOMATION
+                    System.Diagnostics.Debug.WriteLine("DataGridItemAutomationPeer.GetNameCore returns " + owningRowPeerName);
+#endif
                     return owningRowPeerName;
                 }
             }
 
-            return string.Empty;
+            string name = UI.Controls.Properties.Resources.DataGridRowAutomationPeer_ItemType;
+#if DEBUG_AUTOMATION
+            System.Diagnostics.Debug.WriteLine("DataGridItemAutomationPeer.GetNameCore returns " + name);
+#endif
+            return name;
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowAutomationPeer.cs
@@ -37,7 +37,11 @@ protected override AutomationControlType GetAutomationControlTypeCore()
         /// <returns>The string that contains the name.</returns>
         protected override string GetClassNameCore()
         {
-            return Owner.GetType().Name;
+            string classNameCore = Owner.GetType().Name;
+#if DEBUG_AUTOMATION
+            System.Diagnostics.Debug.WriteLine("DataGridRowAutomationPeer.GetClassNameCore returns " + classNameCore);
+#endif
+            return classNameCore;
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowGroupHeaderAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowGroupHeaderAutomationPeer.cs
@@ -37,7 +37,11 @@ protected override AutomationControlType GetAutomationControlTypeCore()
         /// <returns>The string that contains the name.</returns>
         protected override string GetClassNameCore()
         {
-            return Owner.GetType().Name;
+            string classNameCore = Owner.GetType().Name;
+#if DEBUG_AUTOMATION
+            System.Diagnostics.Debug.WriteLine("DataGridRowGroupHeaderAutomationPeer.GetClassNameCore returns " + classNameCore);
+#endif
+            return classNameCore;
         }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowHeaderAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowHeaderAutomationPeer.cs
@@ -45,7 +45,11 @@ protected override AutomationControlType GetAutomationControlTypeCore()
         /// <returns>The string that contains the name.</returns>
         protected override string GetClassNameCore()
         {
-            return Owner.GetType().Name;
+            string classNameCore = Owner.GetType().Name;
+#if DEBUG_AUTOMATION
+            System.Diagnostics.Debug.WriteLine("DataGridRowHeaderAutomationPeer.GetClassNameCore returns " + classNameCore);
+#endif
+            return classNameCore;
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowsPresenterAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowsPresenterAutomationPeer.cs
@@ -74,7 +74,11 @@ protected override IList<AutomationPeer> GetChildrenCore()
         /// <returns>The string that contains the name.</returns>
         protected override string GetClassNameCore()
         {
-            return Owner.GetType().Name;
+            string classNameCore = Owner.GetType().Name;
+#if DEBUG_AUTOMATION
+            System.Diagnostics.Debug.WriteLine("DataGridRowsPresenterAutomationPeer.GetClassNameCore returns " + classNameCore);
+#endif
+            return classNameCore;
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridRowHeader.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridRowHeader.cs
@@ -57,7 +57,7 @@ public partial class DataGridRowHeader : ContentControl
         private const string DATAGRIDROWHEADER_stateNormal = "Normal";
         private const string DATAGRIDROWHEADER_stateNormalCurrentRow = "NormalCurrentRow";
         private const string DATAGRIDROWHEADER_stateNormalEditingRow = "UnfocusedEditingRow";
-        private const string DATAGRIDROWHEADER_stateNormalEditingRowFocused = "Normal EditingRow";
+        private const string DATAGRIDROWHEADER_stateNormalEditingRowFocused = "NormalEditingRow";
         private const string DATAGRIDROWHEADER_stateSelected = "UnfocusedSelected";
         private const string DATAGRIDROWHEADER_stateSelectedCurrentRow = "UnfocusedCurrentRowSelected";
         private const string DATAGRIDROWHEADER_stateSelectedCurrentRowFocused = "NormalCurrentRowSelected";

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`// The .NET Foundation licenses this file to you under the MIT license.`
`3`	`3`	`// See the LICENSE file in the project root for more information.`
`4`	`4`
`5`		`-// #define DEBUG_AUTOMATION`
`6`	`5`	`using System.Collections.Generic;`
`7`	`6`	`using System.Diagnostics;`
`8`	`7`	`using Microsoft.Toolkit.Uwp.UI.Controls;`
`@@ -184,7 +183,11 @@ protected override IList<AutomationPeer> GetChildrenCore()`
`184`	`183`	`/// <returns>The string that contains the name.</returns>`
`185`	`184`	`protected override string GetClassNameCore()`
`186`	`185`	`{`
`187`		`- return Owner.GetType().Name;`
	`186`	`+ string classNameCore = Owner.GetType().Name;`
	`187`	`+#if DEBUG_AUTOMATION`
	`188`	`+ Debug.WriteLine("DataGridAutomationPeer.GetClassNameCore returns " + classNameCore);`
	`189`	`+#endif`
	`190`	`+ return classNameCore;`
`188`	`191`	`}`
`189`	`192`
`190`	`193`	`/// <summary>`
`@@ -212,6 +215,10 @@ protected override string GetNameCore()`
`212`	`215`	`}`
`213`	`216`	`}`
`214`	`217`
	`218`	`+#if DEBUG_AUTOMATION`
	`219`	`+ Debug.WriteLine("DataGridAutomationPeer.GetNameCore returns " + name);`
	`220`	`+#endif`
	`221`	`+`
`215`	`222`	`return name;`
`216`	`223`	`}`
`217`	`224`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,11 @@ protected override AutomationControlType GetAutomationControlTypeCore()`
`107`	`107`	`/// <returns>The string that contains the name.</returns>`
`108`	`108`	`protected override string GetClassNameCore()`
`109`	`109`	`{`
`110`		`- return Owner.GetType().Name;`
	`110`	`+ string classNameCore = Owner.GetType().Name;`
	`111`	`+#if DEBUG_AUTOMATION`
	`112`	`+ System.Diagnostics.Debug.WriteLine("DataGridCellAutomationPeer.GetClassNameCore returns " + classNameCore);`
	`113`	`+#endif`
	`114`	`+ return classNameCore;`
`111`	`115`	`}`
`112`	`116`
`113`	`117`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,11 @@ protected override AutomationControlType GetAutomationControlTypeCore()`
`50`	`50`	`/// <returns>The string that contains the name.</returns>`
`51`	`51`	`protected override string GetClassNameCore()`
`52`	`52`	`{`
`53`		`- return Owner.GetType().Name;`
	`53`	`+ string classNameCore = Owner.GetType().Name;`
	`54`	`+#if DEBUG_AUTOMATION`
	`55`	`+ System.Diagnostics.Debug.WriteLine("DataGridColumnHeaderAutomationPeer.GetClassNameCore returns " + classNameCore);`
	`56`	`+#endif`
	`57`	`+ return classNameCore;`
`54`	`58`	`}`
`55`	`59`
`56`	`60`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,11 @@ protected override AutomationControlType GetAutomationControlTypeCore()`
`37`	`37`	`/// <returns>The string that contains the name.</returns>`
`38`	`38`	`protected override string GetClassNameCore()`
`39`	`39`	`{`
`40`		`- return Owner.GetType().Name;`
	`40`	`+ string classNameCore = Owner.GetType().Name;`
	`41`	`+#if DEBUG_AUTOMATION`
	`42`	`+ System.Diagnostics.Debug.WriteLine("DataGridColumnHeadersPresenterAutomationPeer.GetClassNameCore returns " + classNameCore);`
	`43`	`+#endif`
	`44`	`+ return classNameCore;`
`41`	`45`	`}`
`42`	`46`
`43`	`47`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,11 @@ protected override IList<AutomationPeer> GetChildrenCore()`
`200`	`200`	`/// <returns>The string that contains the name.</returns>`
`201`	`201`	`protected override string GetClassNameCore()`
`202`	`202`	`{`
`203`		`- return this.OwningRowGroupHeaderPeer != null ? this.OwningRowGroupHeaderPeer.GetClassName() : string.Empty;`
	`203`	`+ string classNameCore = this.OwningRowGroupHeaderPeer != null ? this.OwningRowGroupHeaderPeer.GetClassName() : string.Empty;`
	`204`	`+#if DEBUG_AUTOMATION`
	`205`	`+ Debug.WriteLine("DataGridGroupItemAutomationPeer.GetClassNameCore returns " + classNameCore);`
	`206`	`+#endif`
	`207`	`+ return classNameCore;`
`204`	`208`	`}`
`205`	`209`
`206`	`210`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,11 @@ protected override IList<AutomationPeer> GetChildrenCore()`
`151`	`151`	`/// <returns>The string that contains the name.</returns>`
`152`	`152`	`protected override string GetClassNameCore()`
`153`	`153`	`{`
`154`		`- return (this.OwningRowPeer != null) ? this.OwningRowPeer.GetClassName() : string.Empty;`
	`154`	`+ string classNameCore = (this.OwningRowPeer != null) ? this.OwningRowPeer.GetClassName() : string.Empty;`
	`155`	`+#if DEBUG_AUTOMATION`
	`156`	`+ System.Diagnostics.Debug.WriteLine("DataGridItemAutomationPeer.GetClassNameCore returns " + classNameCore);`
	`157`	`+#endif`
	`158`	`+ return classNameCore;`
`155`	`159`	`}`
`156`	`160`
`157`	`161`	`/// <summary>`
`@@ -219,11 +223,18 @@ protected override string GetNameCore()`
`219`	`223`	`string owningRowPeerName = this.OwningRowPeer.GetName();`
`220`	`224`	`if (!string.IsNullOrEmpty(owningRowPeerName))`
`221`	`225`	`{`
	`226`	`+#if DEBUG_AUTOMATION`
	`227`	`+ System.Diagnostics.Debug.WriteLine("DataGridItemAutomationPeer.GetNameCore returns " + owningRowPeerName);`
	`228`	`+#endif`
`222`	`229`	`return owningRowPeerName;`
`223`	`230`	`}`
`224`	`231`	`}`
`225`	`232`
`226`		`- return string.Empty;`
	`233`	`+ string name = UI.Controls.Properties.Resources.DataGridRowAutomationPeer_ItemType;`
	`234`	`+#if DEBUG_AUTOMATION`
	`235`	`+ System.Diagnostics.Debug.WriteLine("DataGridItemAutomationPeer.GetNameCore returns " + name);`
	`236`	`+#endif`
	`237`	`+ return name;`
`227`	`238`	`}`
`228`	`239`
`229`	`240`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,11 @@ protected override AutomationControlType GetAutomationControlTypeCore()`
`45`	`45`	`/// <returns>The string that contains the name.</returns>`
`46`	`46`	`protected override string GetClassNameCore()`
`47`	`47`	`{`
`48`		`- return Owner.GetType().Name;`
	`48`	`+ string classNameCore = Owner.GetType().Name;`
	`49`	`+#if DEBUG_AUTOMATION`
	`50`	`+ System.Diagnostics.Debug.WriteLine("DataGridRowHeaderAutomationPeer.GetClassNameCore returns " + classNameCore);`
	`51`	`+#endif`
	`52`	`+ return classNameCore;`
`49`	`53`	`}`
`50`	`54`
`51`	`55`	`/// <summary>`