Revert #4808 fix. Due to #12591 and investigations. #12729
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #12591.
This revert #4808 fix commit from #11358 PR.
The clean up of
DisplayedItems
after removal has already been implemented inDoLayoutIfHandleCreated
but only if handle is created:winforms/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/ToolStrip.cs
Lines 3218 to 3224 in 034543a
winforms/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/ToolStrip.cs
Lines 3244 to 3247 in 034543a
So we have leak only if handle is destroyed (#4808 case) and we didn't take this into account :(
All are much more complicated than originally intended. And lead to some side affect see this comment.
I think that is safer to revert the fix and reopen #4808 then.
Microsoft Reviewers: Open in CodeFlow