Merge pull request #2090 from arpitmathur/dev/arpit/menuautomationpeer

Removing separators from SizeOfSet and PositionInSet counts
dotnet · Oct 29, 2019 · be31d18 · be31d18
2 parents 2da6b1e + 970bb33
commit be31d18
Showing 1 changed file with 31 additions and 10 deletions.
diff --git a/...t.Wpf/src/PresentationFramework/System/Windows/Automation/Peers/MenuItemAutomationPeer.cs b/...t.Wpf/src/PresentationFramework/System/Windows/Automation/Peers/MenuItemAutomationPeer.cs
@@ -78,8 +78,8 @@ override public object GetPattern(PatternInterface patternInterface)
 
 
             return result;
-        }
-
+        }
+
         /// <summary>
         /// Gets the size of a set that contains this MenuItem.
         /// </summary>
@@ -94,14 +94,22 @@ override public object GetPattern(PatternInterface patternInterface)
         override protected int GetSizeOfSetCore()
         {
             int sizeOfSet = base.GetSizeOfSetCore();
-
+            
             if (sizeOfSet == AutomationProperties.AutomationSizeOfSetDefault)
             {
-                MenuItem owner = (MenuItem)Owner;
+                MenuItem owner = (MenuItem)Owner;
                 ItemsControl parent = ItemsControl.ItemsControlFromItemContainer(owner);
 
-                sizeOfSet = ItemAutomationPeer.GetSizeOfSetFromItemsControl(parent, owner);
-            }
+                sizeOfSet = ItemAutomationPeer.GetSizeOfSetFromItemsControl(parent, owner);
+
+                foreach (var item in parent.Items)
+                {
+                    if (item is Separator)
+                    {
+                        sizeOfSet -= 1;
+                    }
+                }
+            }
 
             return sizeOfSet;
         }
@@ -118,13 +126,26 @@ override protected int GetSizeOfSetCore()
         override protected int GetPositionInSetCore()
         {
             int positionInSet = base.GetPositionInSetCore();
-
+            
             if (positionInSet == AutomationProperties.AutomationPositionInSetDefault)
             {
-                MenuItem owner = (MenuItem)Owner;
+                MenuItem owner = (MenuItem)Owner;
                 ItemsControl parent = ItemsControl.ItemsControlFromItemContainer(owner);
-                positionInSet = ItemAutomationPeer.GetPositionInSetFromItemsControl(parent, owner);
-            }
+
+                positionInSet = ItemAutomationPeer.GetPositionInSetFromItemsControl(parent, owner);
+
+                foreach (var item in parent.Items)
+                {
+                    if (item == owner)
+                    {
+                        break;
+                    }
+                    if (item is Separator)
+                    {
+                        positionInSet -= 1;
+                    }
+                }
+            }
 
             return positionInSet;
         }