Skip to content

Commit 92299aa

Browse files
author
Ricardo Bossan (BEYONDSOFT CONSULTING INC) (from Dev Box)
committed
Adds ExpandColapse pattern to SplitButton
1 parent 4419d3a commit 92299aa

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

src/System.Windows.Forms/System/Windows/Forms/Controls/ToolStrips/ToolStripSplitButton.ToolStripSplitButtonExAccessibleObject.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@ internal override VARIANT GetPropertyValue(UIA_PROPERTY_ID propertyID) =>
2424
// If we don't set a default role for the accessible object
2525
// it will be retrieved from Windows.
2626
// And we don't have a 100% guarantee it will be correct, hence set it ourselves.
27+
// SplitButton control type requires ExpandCollapse pattern support.
2728
UIA_PROPERTY_ID.UIA_ControlTypePropertyId when
2829
_owningToolStripSplitButton.AccessibleRole == AccessibleRole.Default
29-
=> (VARIANT)(int)UIA_CONTROLTYPE_ID.UIA_ButtonControlTypeId,
30+
=> (VARIANT)(int)UIA_CONTROLTYPE_ID.UIA_SplitButtonControlTypeId,
3031
_ => base.GetPropertyValue(propertyID)
3132
};
3233

src/test/unit/System.Windows.Forms/System/Windows/Forms/AccessibleObjects/ToolStripSplitButton.ToolStripSplitButtonAccessibleObjectTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ public void ToolStripSplitButtonAccessibleObject_Ctor_Default()
2020
}
2121

2222
[WinFormsFact]
23-
public void ToolStripSplitButtonAccessibleObject_ControlType_IsButton_IfAccessibleRoleIsDefault()
23+
public void ToolStripSplitButtonAccessibleObject_ControlType_IsSplitButton_IfAccessibleRoleIsDefault()
2424
{
2525
using ToolStripSplitButton toolStripSplitButton = new();
2626
// AccessibleRole is not set = Default
2727

2828
var actual = (UIA_CONTROLTYPE_ID)(int)toolStripSplitButton.AccessibilityObject.GetPropertyValue(UIA_PROPERTY_ID.UIA_ControlTypePropertyId);
2929

30-
Assert.Equal(UIA_CONTROLTYPE_ID.UIA_ButtonControlTypeId, actual);
30+
Assert.Equal(UIA_CONTROLTYPE_ID.UIA_SplitButtonControlTypeId, actual);
3131
}
3232

3333
[WinFormsFact]

src/test/unit/System.Windows.Forms/System/Windows/Forms/AccessibleObjects/ToolStripSplitButton.ToolStripSplitButtonExAccessibleObjectTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public void ToolStripSplitButtonExAccessibleObject_ControlType_ReturnsExpected()
2323

2424
ToolStripSplitButtonExAccessibleObject accessibleObject = new(toolStripSplitButton);
2525

26-
Assert.Equal(UIA_CONTROLTYPE_ID.UIA_ButtonControlTypeId, (UIA_CONTROLTYPE_ID)(int)accessibleObject.GetPropertyValue(UIA_PROPERTY_ID.UIA_ControlTypePropertyId));
26+
Assert.Equal(UIA_CONTROLTYPE_ID.UIA_SplitButtonControlTypeId, (UIA_CONTROLTYPE_ID)(int)accessibleObject.GetPropertyValue(UIA_PROPERTY_ID.UIA_ControlTypePropertyId));
2727
}
2828

2929
[WinFormsFact]

0 commit comments

Comments
 (0)