fix #13400 Cannot enter characters when adding ToolStripMenuItem1 and then adding ToolStripMenuItem2 after pressing enter in DemoConsole application #13420
Conversation
…m1 and then adding ToolStripMenuItem2 after pressing enter in DemoConsole application
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #13420 +/- ##
===================================================
- Coverage 76.60371% 76.59942% -0.00430%
===================================================
Files 3230 3230
Lines 639097 639108 +11
Branches 47289 47291 +2
===================================================
- Hits 489572 489553 -19
- Misses 145953 145980 +27
- Partials 3572 3575 +3
Flags with carried forward coverage won't be shown. Click here to find out more. 🚀 New features to boost your workflow:
|
|
|
||
| static bool IsOuterToolStrip(ToolStrip toolStrip) | ||
| { | ||
| static ToolStrip getParentToolStrip(ToolStrip toolStrip) |
There was a problem hiding this comment.
- Had you searched if we already have methods that do the same thing?
- Enable nullability around this new code - Parent can not a toolstrip.
- Please replace recursion with a
whileloop. - In general, while making changes, ask VS copilot chat to review your work. and make suggestions to improve the code.
- Do we have a test case in the interactive test app, if not, please add one, create a new page if needed.
- when creating a PR, please verify if labeler adds a correct label and if the one it adds if needed.
There was a problem hiding this comment.
Had you searched if we already have methods that do the same thing?
We have one similar method, but it doesn't satisfy me.
There was a problem hiding this comment.
Do we have a test case in the interactive test app, if not, please add one, create a new page if needed.
This issue happens in DemoConsole. if we need to add a test case in the interactive test app, then I think we will need to build up a Desginer Environment like DemoConsole.
|
|
||
| static bool IsOuterToolStrip(ToolStrip toolStrip) | ||
| { | ||
| static ToolStrip getParentToolStrip(ToolStrip toolStrip) |
There was a problem hiding this comment.
Methods should be PastelCase
There was a problem hiding this comment.
Pull Request Overview
This PR addresses issue #13400 by reducing unnecessary invocations of ToolStripManager.ModalMenuFilter.SetActiveToolStrip, which previously affected focus behavior in the DemoConsole application.
- Added a condition to ensure SetActiveToolStrip is only called for outer (top-level) ToolStrips
- Introduced a static local function IsOuterToolStrip to traverse the parent hierarchy
Comments suppressed due to low confidence (1)
src/System.Windows.Forms/System/Windows/Forms/Controls/ToolStrips/ToolStrip.cs:4655
- [nitpick] The method name 'IsOuterToolStrip' may be ambiguous; consider renaming it to 'IsRootToolStrip' to clearly indicate that it checks for a top-level ToolStrip.
static bool IsOuterToolStrip(ToolStrip toolStrip)
src/System.Windows.Forms/System/Windows/Forms/Controls/ToolStrips/ToolStrip.cs
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Pull Request Overview
This PR addresses issue #13400 by refining the logic in WndProc to prevent multiple invocations of SetActiveToolStrip when the ToolStrip does not lose focus.
- Added a condition to only call SetActiveToolStrip if the current ToolStrip is an outer ToolStrip.
- Introduced a local static helper method, IsOuterToolStrip, to determine if the ToolStrip is at the top of the hierarchy.
src/System.Windows.Forms/System/Windows/Forms/Controls/ToolStrips/ToolStrip.cs
Outdated
Show resolved
Hide resolved
src/System.Windows.Forms/System/Windows/Forms/Controls/ToolStrips/ToolStrip.cs
Show resolved
Hide resolved
There was a problem hiding this comment.
Pull Request Overview
This PR fixes issue #13400 by restricting focus changes to only the outermost ToolStrip, preventing redundant invocations of ToolStripManager.ModalMenuFilter.SetActiveToolStrip.
- Added a conditional check ("if (IsOuterToolStrip(this))") in WndProc to ensure the active ToolStrip is the outer one.
- Introduced a local static helper function, IsOuterToolStrip, to navigate the parent hierarchy and determine the outer ToolStrip.
Comments suppressed due to low confidence (1)
src/System.Windows.Forms/System/Windows/Forms/Controls/ToolStrips/ToolStrip.cs:4586
- Include unit tests for scenarios with nested ToolStrips to ensure that the outer ToolStrip is correctly identified and activated.
if (IsOuterToolStrip(this))
Fixes #13400
Proposed changes
This issue is introduced by pull/13034, this is the change made by it.
protected override void WndProc(ref Message m) { if (m.MsgInternal == PInvokeCore.WM_SETFOCUS) { SnapFocus((HWND)(nint)m.WParamInternal); + // For fix https://github.com/dotnet/winforms/issues/12916 + ToolStripManager.ModalMenuFilter.SetActiveToolStrip(this); } ....In my debugging, I found that
ToolStripManager.ModalMenuFilter.SetActiveToolStrip(this);got invoked too many times evenToolStripdidn't lost focus, which I think caused the issue.So I exclude some cases.
Screenshots
Before
cannot.input.mp4
After
Test methodology