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 0% with 52 lines in your changes missing coverage. Please review.

Project coverage is 76.12229%. Comparing base (9a8b5a2) to head (8ecf0b8).
Report is 1 commits behind head on main.

Additional details and impacted files

@@                 Coverage Diff                 @@
##                main      #12698         +/-   ##
===================================================
- Coverage   76.13144%   76.12229%   -0.00915%     
===================================================
  Files           3232        3232                 
  Lines         642100      642147         +47     
  Branches       47264       47272          +8     
===================================================
- Hits          488840      488817         -23     
- Misses        149716      149777         +61     
- Partials        3544        3553          +9     

Flag	Coverage Δ
Debug	76.12229% <0.00000%> (-0.00915%)	⬇️
integration	18.10319% <0.00000%> (-0.00264%)	⬇️
production	50.05482% <0.00000%> (-0.01701%)	⬇️
test	96.98657% <ø> (+0.00056%)	⬆️
unit	47.49384% <0.00000%> (-0.01484%)	⬇️

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

[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;