Recalculate the node position of the TreeView when DrawMode = TreeViewDrawMode.OwnerDrawText

[LeafShi1]

Fixes #12681

Root Cause

When treeView.DrawMode = TreeViewDrawMode.OwnerDrawText, the node's FillRectangle and FocusRectangle positions are calculated incorrectly

Proposed changes

• Update function CustomDraw of the TreeView.cs, When RightToLeft == RightToLeft.Yes && RightToLeftLayout reverses the X drawing coordinates of FillRectangle and FocusRectangle

Customer Impact

• When setting RightToLeft = Yes and RightToLeftLayout = True, the selected node box is fully rendered

Regression?

• No

Risk

• Minimal

Screenshots

Before

After

When setting RightToLeft = Yes, RightToLeftLayout = True and .DrawMode = TreeViewDrawMode.OwnerDrawText, the selected node box is fully rendered

Test methodology

• Manually

Test environment(s)

• .net 10.0.0-alpha.1.24628.1

Microsoft Reviewers: Open in CodeFlow

[codecov]

Codecov Report

Attention: Patch coverage is 64.33710% with 1041 lines in your changes missing coverage. Please review.

Project coverage is 61.29163%. Comparing base (d1bbb32) to head (5cb9458).
Report is 171 commits behind head on main.

Additional details and impacted files

@@                 Coverage Diff                  @@
##                main      #12698          +/-   ##
====================================================
- Coverage   76.13468%   61.29163%   -14.84306%     
====================================================
  Files           3242        1541        -1701     
  Lines         642363      158281      -484082     
  Branches       47271       14743       -32528     
====================================================
- Hits          489061       97013      -392048     
+ Misses        149751       60571       -89180     
+ Partials        3551         697        -2854     

Flag	Coverage Δ
Debug	61.29163% <64.33710%> (-14.84306%)	⬇️
integration	10.73249% <13.88305%> (-7.36435%)	⬇️
production	39.16159% <59.46392%> (-10.91881%)	⬇️
test	95.67602% <88.25911%> (-1.30056%)	⬇️
unit	36.58737% <58.39175%> (-10.93210%)	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

🚀 New features to boost your workflow:

• ❄ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
• 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

[ricardobossan]

I proceeded to test the PR and the issue seems to have been solved:

The code LGTM!

[Tanya-Solyanik]

Had you tested this change at different scaling factors and in different level nodes in a tree view? For example 3rd level child?
It will be helpful to add code comments that describe what the constants are for.

Copilot reviewed 1 out of 1 changed files in this pull request and generated no comments.

Comments suppressed due to low confidence (3)

src/System.Windows.Forms/src/System/Windows/Forms/Controls/TreeView/TreeView.cs:2907

• [nitpick] The method name 'PreferredHeight' is not very descriptive. Consider renaming it to 'CalculatePreferredHeight'.

private int PreferredHeight

src/System.Windows.Forms/src/System/Windows/Forms/Controls/TreeView/TreeView.cs:2921

• [nitpick] The method name 'GetNodeHeight' is not very descriptive. Consider renaming it to 'CalculateNodeHeight'.

private int GetNodeHeight(TreeNode node)

src/System.Windows.Forms/src/System/Windows/Forms/Controls/TreeView/TreeView.cs:2741

• Using 'goto' is generally considered bad practice. Consider refactoring the code to eliminate the need for 'goto'.

goto default;

[LeafShi1]

No regressions found in private PRs

[Tanya-Solyanik]

@LeafShi1 - even though "issue5" as reported by Olina, is not a regression from the previous release, it is a regression from .NET Framework, could you please investigate it?

[LeafShi1]

The issue5: The right border of the node's checkbox is not visible in the edit mode of the node

This issue repro in MFC app and not repro in .NET Framework project:

[LeafShi1]

Reposition the edit text box to fix the issue The right border of the node's checkbox is not visible in the edit mode of the node