-
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
[Feature] Add FillRule property for Polyline/Polygon #20159
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.
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
base: master
Are you sure you want to change the base?
Conversation
| } | ||
|
|
||
| [Fact] | ||
| public void FillRule_On_Polygon_Is_Applied_To_DefiningGeometry() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note: Tested in the Gallery already but there is not a specific Shapes Page. Should include it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tested with:
<TextBlock Classes="h3" Margin="0,12,0,4">Path FillRule</TextBlock>
<TextBlock Text="EvenOdd creates holes for nested figures; NonZero keeps the interior filled when the contours wind in the same direction." />
<StackPanel Orientation="Horizontal" Spacing="12">
<StackPanel Spacing="4">
<TextBlock Text="EvenOdd" />
<Border Background="White" BorderBrush="Gainsboro" BorderThickness="1" Padding="8" CornerRadius="4">
<Path Width="140"
Height="140"
Stretch="Fill"
Fill="Orange"
Stroke="Black"
StrokeThickness="1"
Data="F1 M 10,10 L 130,10 130,130 10,130 Z M 50,50 L 90,50 90,90 50,90 Z"/>
</Border>
</StackPanel>
<StackPanel Spacing="4">
<TextBlock Text="NonZero" />
<Border Background="White" BorderBrush="Gainsboro" BorderThickness="1" Padding="8" CornerRadius="4">
<Path Width="140"
Height="140"
Stretch="Fill"
Fill="Orange"
Stroke="Black"
StrokeThickness="1"
Data="F0 M 10,10 L 130,10 130,130 10,130 Z M 50,50 L 90,50 90,90 50,90 Z"/>
</Border>
</StackPanel>
</StackPanel>
<TextBlock Classes="h3" Margin="0,12,0,4">Polygon/Polyline FillRule</TextBlock>
<TextBlock Text="Self-intersecting polygons show different winding behavior for EvenOdd and NonZero." />
<StackPanel Orientation="Horizontal" Spacing="12">
<StackPanel Spacing="4">
<TextBlock Text="EvenOdd" />
<Border Background="White" BorderBrush="Gainsboro" BorderThickness="1" Padding="8" CornerRadius="4">
<Polygon Width="160"
Height="160"
Stretch="Fill"
Fill="Gold"
Stroke="Black"
StrokeThickness="1"
FillRule="EvenOdd"
Points="50,0 21,90 98,35 2,35 79,90" />
</Border>
</StackPanel>
<StackPanel Spacing="4">
<TextBlock Text="NonZero" />
<Border Background="White" BorderBrush="Gainsboro" BorderThickness="1" Padding="8" CornerRadius="4">
<Polygon Width="160"
Height="160"
Stretch="Fill"
Fill="Gold"
Stroke="Black"
StrokeThickness="1"
FillRule="NonZero"
Points="50,0 21,90 98,35 2,35 79,90" />
</Border>
</StackPanel>
</StackPanel>
<TextBlock Classes="h3" Margin="0,12,0,4">Polyline FillRule</TextBlock>
<TextBlock Text="A jagged filled polyline using NonZero/EvenOdd winding (adapted from WPF FillRule sample)." />
<StackPanel Orientation="Horizontal" Spacing="12">
<StackPanel Spacing="4">
<TextBlock Text="EvenOdd" />
<Border Background="White" BorderBrush="Gainsboro" BorderThickness="1" Padding="8" CornerRadius="4">
<Polyline Width="200"
Height="140"
Stretch="Fill"
Fill="Red"
Stroke="Black"
StrokeThickness="2"
FillRule="EvenOdd"
Points="10,140
60,20
110,140
20,60
180,60
90,140
140,20
10,140" />
</Border>
</StackPanel>
<StackPanel Spacing="4">
<TextBlock Text="NonZero" />
<Border Background="White" BorderBrush="Gainsboro" BorderThickness="1" Padding="8" CornerRadius="4">
<Polyline Width="200"
Height="140"
Stretch="Fill"
Fill="Red"
Stroke="Black"
StrokeThickness="2"
FillRule="NonZero"
Points="10,140
60,20
110,140
20,60
180,60
90,140
140,20
10,140" />
</Border>
</StackPanel>
</StackPanel>
|
You can test this PR using the following package version. |
|
Please read the following Contributor License Agreement (CLA). If you agree with the CLA, please reply with the following: Contributor License AgreementContribution License AgreementThis Contribution License Agreement ( “Agreement” ) is agreed to by the party signing below ( “You” ), 1. Definitions. “Code” means the computer software code, whether in human-readable or machine-executable form, “Project” means any of the projects owned or managed by AvaloniaUI OÜ and offered under a license “Submit” is the act of uploading, submitting, transmitting, or distributing code or other content to any “Submission” means the Code and any other copyrightable material Submitted by You, including any 2. Your Submission. You must agree to the terms of this Agreement before making a Submission to any 3. Originality of Work. You represent that each of Your Submissions is entirely Your 4. Your Employer. References to “employer” in this Agreement include Your employer or anyone else 5. Licenses. a. Copyright License. You grant AvaloniaUI OÜ, and those who receive the Submission directly b. Patent License. You grant AvaloniaUI OÜ, and those who receive the Submission directly or c. Other Rights Reserved. Each party reserves all rights not expressly granted in this Agreement. 6. Representations and Warranties. You represent that You are legally entitled to grant the above 7. Notice to AvaloniaUI OÜ. You agree to notify AvaloniaUI OÜ in writing of any facts or 8. Information about Submissions. You agree that contributions to Projects and information about 9. Governing Law/Jurisdiction. This Agreement is governed by the laws of the Republic of Estonia, and 10. Entire Agreement/Assignment. This Agreement is the entire agreement between the parties, and AvaloniaUI OÜ dedicates this Contribution License Agreement to the public domain according to the Creative Commons CC0 1. |
|
Notes from the API review meeting: Add a new overload Also, please add a couple of render tests. |
Applied changes:
|
|
There's a conflict on |
MrJul
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
What does the pull request do?
Adds FillRule support to Polyline/Polygon. Polyline now builds a filled geometry when a Fill is provided and propagates FillRule; PolylineGeometry accepts and applies the fill rule. Samples were updated to demonstrate EvenOdd vs NonZero.
FillRule determines how the intersecting areas contained in a Polyline/Polygon/Geometry are combined.
What is the current behavior?
Polyline and Polygon FillRule had no effect.
What is the updated/expected behavior with this PR?
Polyline and Polygon respect FillRule (EvenOdd vs NonZero) when a Fill is set; hit-testing remains stroke-only when Fill is null.
How was the solution implemented (if it's not obvious)?
Checklist
Breaking changes
Polyline still returns PolylineGeometry; it now fills only when Fill is set (so hit-testing stays stroke-only by default).
Obsoletions / Deprecations
None.
Fixed issues
Fixes #20158