Skip to content

Fix the focus issue of SmartTag/DropDown by preserving the modal menu tracking of ToolStripDropDown. #14606

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

Open
LeafShi1 wants to merge 1 commit into
base: main
Choose a base branch
from
+29 −14
Open

Fix the focus issue of SmartTag/DropDown by preserving the modal menu tracking of ToolStripDropDown. #14606

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 29 additions & 14 deletions src/System.Windows.Forms/System/Windows/Forms/Controls/ToolStrips/ToolStrip.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3934,7 +3934,7 @@ internal override void ReleaseUiaProvider(HWND handle)
/// <param name="items">contains ToolStrip or ToolStripDropDown items to disconnect</param>
internal virtual void ReleaseToolStripItemsProviders(ToolStripItemCollection items)
{
ToolStripItem[] itemsArray = [..items.Cast<ToolStripItem>()];
ToolStripItem[] itemsArray = [.. items.Cast<ToolStripItem>()];
foreach (ToolStripItem toolStripItem in itemsArray)
{
if (toolStripItem is ToolStripDropDownItem dropDownItem && dropDownItem.DropDownItems.Count > 0)
Expand Down Expand Up @@ -4579,31 +4579,46 @@ protected override void WndProc(ref Message m)
{
SnapFocus((HWND)(nint)m.WParamInternal);

if (IsDropDown)
{
// Designer SmartTag panels are hosted in ToolStripDropDown. Keep these
// participating in modal menu tracking regardless of previous focus.
ToolStripManager.ModalMenuFilter.SetActiveToolStrip(this);
}

// Only activate ModalMenuFilter when focus transfers
// between ToolStrips (to fix #12916).
// Do NOT activate on generic Tab focus (#14489).
HWND previousFocus = (HWND)(nint)m.WParamInternal;
Control? previousControl = FromChildHandle(previousFocus);
if (previousControl is ToolStrip || previousControl?.Parent is ToolStrip)
else
{
ToolStripManager.ModalMenuFilter.SetActiveToolStrip(this);
HWND previousFocus = (HWND)(nint)m.WParamInternal;
Control? previousControl = FromChildHandle(previousFocus);
if (previousControl is ToolStrip || previousControl?.Parent is ToolStrip)
{
ToolStripManager.ModalMenuFilter.SetActiveToolStrip(this);
}
}
}

if (m.MsgInternal == PInvokeCore.WM_KILLFOCUS)
{
// Clear modal menu tracking when focus leaves ToolStrip context so
// keyboard input is not incorrectly routed after tabbing away.
HWND nextFocus = (HWND)(nint)m.WParamInternal;
Control? nextControl = FromChildHandle(nextFocus);
if (ToolStripManager.ModalMenuFilter.GetActiveToolStrip() == this
&& nextControl is not ToolStrip
&& nextControl?.Parent is not ToolStrip)
{
ToolStripManager.ModalMenuFilter.RemoveActiveToolStrip(this);
if (ToolStripManager.ModalMenuFilter.GetActiveToolStrip() is null)
// Keep ToolStripDropDowns in menu tracking while they remain visible (for
// example, designer SmartTag panels that may temporarily transfer focus).
if (!IsDropDown)
{
HWND nextFocus = (HWND)(nint)m.WParamInternal;
Control? nextControl = FromChildHandle(nextFocus);
if (ToolStripManager.ModalMenuFilter.GetActiveToolStrip() == this
&& nextControl is not ToolStrip
&& nextControl?.Parent is not ToolStrip)
{
ToolStripManager.ModalMenuFilter.ExitMenuMode();
ToolStripManager.ModalMenuFilter.RemoveActiveToolStrip(this);
if (ToolStripManager.ModalMenuFilter.GetActiveToolStrip() is null)
{
ToolStripManager.ModalMenuFilter.ExitMenuMode();
}
}
}
}
Expand Down
Loading