Skip to content

fix #13344 Disabled ToolstripMenuItems are no longer highlighted #13354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 27, 2025
Merged

fix #13344 Disabled ToolstripMenuItems are no longer highlighted #13354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9dc5bc2
fix #13344 Disabled ToolstripMenuItems are no longer highlighted
Epica3055 Apr 23, 2025
9f20491
modify unit test
Epica3055 Apr 24, 2025
c7d5472
fix unit test
Epica3055 Apr 24, 2025
78f790f
fix comment
Epica3055 Apr 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/System.Windows.Forms/System/Windows/Forms/Controls/ToolStrips/ToolStripItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,12 +573,12 @@ public Rectangle ContentRectangle
/// Determines whether or not the item can be selected.
/// </summary>
[Browsable(false)]
public virtual bool CanSelect => Enabled;
public virtual bool CanSelect => true;

/// <remarks>
/// <para>Usually the same as can select, but things like the control box in an MDI window are exceptions</para>
/// </remarks>
internal virtual bool CanKeyboardSelect => CanSelect;
internal virtual bool CanKeyboardSelect => CanSelect && Enabled;

/// <summary>
/// Occurs when the control is clicked.
Expand Down Expand Up @@ -3158,7 +3158,7 @@ internal void Select(bool forceRaiseAccessibilityFocusChanged)
forceRaiseAccessibilityFocusChanged = true;
}

if (forceRaiseAccessibilityFocusChanged)
if (forceRaiseAccessibilityFocusChanged && Enabled)
{
bool accessibilityIsOn = IsAccessibilityObjectCreated ||
// When ToolStripItem is selected automatically for the first time
Expand Down
6 changes: 3 additions & 3 deletions src/test/unit/System.Windows.Forms/System/Windows/Forms/ToolStripButtonTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1040,8 +1040,8 @@ public void ToolStripButton_CreateAccessibilityInstance_InvokeCheckOnClick_Retur
[WinFormsTheory]
[InlineData(true, CheckState.Checked, AccessibleStates.Focusable | AccessibleStates.Checked)]
[InlineData(true, CheckState.Indeterminate, AccessibleStates.Focusable | AccessibleStates.Checked)]
[InlineData(false, CheckState.Checked, AccessibleStates.None)]
[InlineData(false, CheckState.Indeterminate, AccessibleStates.None)]
[InlineData(false, CheckState.Checked, AccessibleStates.Unavailable)]
[InlineData(false, CheckState.Indeterminate, AccessibleStates.Unavailable)]
public void ToolStripButton_CreateAccessibilityInstance_InvokeChecked_ReturnsExpected(bool enabled, CheckState checkState, AccessibleStates expectedState)
{
using SubToolStripButton item = new()
Expand All @@ -1058,7 +1058,7 @@ public void ToolStripButton_CreateAccessibilityInstance_InvokeChecked_ReturnsExp

[WinFormsTheory]
[InlineData(true, AccessibleStates.Focused | AccessibleStates.HotTracked | AccessibleStates.Focusable)]
[InlineData(false, AccessibleStates.None)]
[InlineData(false, AccessibleStates.Unavailable | AccessibleStates.Focused)]
public void ToolStripButton_CreateAccessibilityInstance_InvokeSelected_ReturnsExpected(bool enabled, AccessibleStates expectedState)
{
using SubToolStripButton item = new()
Expand Down