Skip to content

Conversation

@jsuarezruiz
Copy link
Contributor

@jsuarezruiz jsuarezruiz commented Nov 27, 2025

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.

Screenshot 2025-11-27 at 12 17 17

How was the solution implemented (if it's not obvious)?

  • Polyline constructs PolylineGeometry with isFilled = Fill != null and passes FillRule via constructor.
  • PolylineGeometry accepts a fill rule and applies it to the stream context.

Checklist

Screenshot 2025-11-27 at 13 03 41

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

@jsuarezruiz jsuarezruiz added the needs-api-review The PR adds new public APIs that should be reviewed. label Nov 27, 2025
}

[Fact]
public void FillRule_On_Polygon_Is_Applied_To_DefiningGeometry()
Copy link
Contributor Author

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?

Copy link
Contributor Author

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>

@avaloniaui-bot
Copy link

You can test this PR using the following package version. 12.0.999-cibuild0060421-alpha. (feed url: https://nuget-feed-all.avaloniaui.net/v3/index.json) [PRBUILDID]

@cla-avalonia
Copy link
Collaborator

cla-avalonia commented Nov 27, 2025

@jsuarezruiz,

Please read the following Contributor License Agreement (CLA). If you agree with the CLA, please reply with the following:

@cla-avalonia agree
Contributor License Agreement

Contribution License Agreement

This Contribution License Agreement ( “Agreement” ) is agreed to by the party signing below ( “You” ),
and conveys certain license rights to the AvaloniaUI OÜ ( “AvaloniaUI OÜ” ) for Your contributions to
AvaloniaUI OÜ open source projects. This Agreement is effective as of the latest signature date below.

1. Definitions.

“Code” means the computer software code, whether in human-readable or machine-executable form,
that is delivered by You to AvaloniaUI OÜ under this Agreement.

“Project” means any of the projects owned or managed by AvaloniaUI OÜ and offered under a license
approved by the Open Source Initiative (www.opensource.org).

“Submit” is the act of uploading, submitting, transmitting, or distributing code or other content to any
Project, including but not limited to communication on electronic mailing lists, source code control
systems, and issue tracking systems that are managed by, or on behalf of, the Project for the purpose of
discussing and improving that Project, but excluding communication that is conspicuously marked or
otherwise designated in writing by You as “Not a Submission.”

“Submission” means the Code and any other copyrightable material Submitted by You, including any
associated comments and documentation.

2. Your Submission. You must agree to the terms of this Agreement before making a Submission to any
Project. This Agreement covers any and all Submissions that You, now or in the future (except as
described in Section 4 below), Submit to any Project.

3. Originality of Work. You represent that each of Your Submissions is entirely Your
original work. Should You wish to Submit materials that are not Your original work,
You may Submit them separately to the Project if You (a) retain all copyright and
license information that was in the materials as you received them, (b) in the
description accompanying your Submission, include the phrase "Submission
containing materials of a third party:" followed by the names of the third party and any
licenses or other restrictions of which You are aware, and (c) follow any other
instructions in the Project's written guidelines concerning Submissions.

4. Your Employer. References to “employer” in this Agreement include Your employer or anyone else
for whom You are acting in making Your Submission, e.g. as a contractor, vendor, or agent. If Your
Submission is made in the course of Your work for an employer or Your employer has intellectual
property rights in Your Submission by contract or applicable law, You must secure permission from Your
employer to make the Submission before signing this Agreement. In that case, the term “You” in this
Agreement will refer to You and the employer collectively. If You change employers in the future and
desire to Submit additional Submissions for the new employer, then You agree to sign a new Agreement
and secure permission from the new employer before Submitting those Submissions.

5. Licenses.

a. Copyright License. You grant AvaloniaUI OÜ, and those who receive the Submission directly
or indirectly from AvaloniaUI OÜ, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable
license in the Submission to reproduce, prepare derivative works of, publicly display, publicly perform,
and distribute the Submission and such derivative works, and to sublicense any or all of the foregoing
rights to third parties.

b. Patent License. You grant AvaloniaUI OÜ, and those who receive the Submission directly or
indirectly from AvaloniaUI OÜ, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license
under Your patent claims that are necessarily infringed by the Submission or the combination of the
Submission with the Project to which it was Submitted to make, have made, use, offer to sell, sell and
import or otherwise dispose of the Submission alone or with the Project.

c. Other Rights Reserved. Each party reserves all rights not expressly granted in this Agreement.
No additional licenses or rights whatsoever (including, without limitation, any implied licenses) are
granted by implication, exhaustion, estoppel or otherwise.

6. Representations and Warranties. You represent that You are legally entitled to grant the above
licenses. You represent that each of Your Submissions is entirely Your original work (except as You may
have disclosed under Section 3 ). You represent that You have secured permission from Your employer to
make the Submission in cases where Your Submission is made in the course of Your work for Your
employer or Your employer has intellectual property rights in Your Submission by contract or applicable
law. If You are signing this Agreement on behalf of Your employer, You represent and warrant that You
have the necessary authority to bind the listed employer to the obligations contained in this Agreement.
You are not expected to provide support for Your Submission, unless You choose to do so. UNLESS
REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING, AND EXCEPT FOR THE WARRANTIES
EXPRESSLY STATED IN SECTIONS 3, 4, AND 6 , THE SUBMISSION PROVIDED UNDER THIS AGREEMENT IS
PROVIDED WITHOUT WARRANTY OF ANY KIND, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY OF
NONINFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE.

7. Notice to AvaloniaUI OÜ. You agree to notify AvaloniaUI OÜ in writing of any facts or
circumstances of which You later become aware that would make Your representations in this
Agreement inaccurate in any respect.

8. Information about Submissions. You agree that contributions to Projects and information about
contributions may be maintained indefinitely and disclosed publicly, including Your name and other
information that You submit with Your Submission.

9. Governing Law/Jurisdiction. This Agreement is governed by the laws of the Republic of Estonia, and
the parties consent to exclusive jurisdiction and venue in the courts sitting in Talinn,
Estonia. The parties waive all defenses of lack of personal jurisdiction and forum non-conveniens.

10. Entire Agreement/Assignment. This Agreement is the entire agreement between the parties, and
supersedes any and all prior agreements, understandings or communications, written or oral, between
the parties relating to the subject matter hereof. This Agreement may be assigned by AvaloniaUI OÜ.

AvaloniaUI OÜ dedicates this Contribution License Agreement to the public domain according to the Creative Commons CC0 1.

@MrJul MrJul added feature area-rendering backport-candidate-11.3.x Consider this PR for backporting to 11.3 branch and removed backport-candidate-11.3.x Consider this PR for backporting to 11.3 branch labels Nov 27, 2025
@jsuarezruiz jsuarezruiz requested a review from MrJul December 2, 2025 12:29
@MrJul
Copy link
Member

MrJul commented Dec 3, 2025

Notes from the API review meeting:

Add a new overload PolylineGeometry(IEnumerable<Point> points, bool isFilled, FillRule fillRule) instead of adding an optional parameter to the existing constructor, which is a binary breaking change.

Also, please add a couple of render tests.

@MrJul MrJul added api-change-requested The new public APIs need some changes. backport-candidate-11.3.x Consider this PR for backporting to 11.3 branch and removed needs-api-review The PR adds new public APIs that should be reviewed. labels Dec 3, 2025
@jsuarezruiz
Copy link
Contributor Author

Notes from the API review meeting:

Add a new overload PolylineGeometry(IEnumerable<Point> points, bool isFilled, FillRule fillRule) instead of adding an optional parameter to the existing constructor, which is a binary breaking change.

Also, please add a couple of render tests.

Applied changes:

  • Restored binary compatibility for PolylineGeometry by reintroducing the original two-parameter constructor and adding a separate three-parameter overload.
  • Added render tests.

@MrJul
Copy link
Member

MrJul commented Dec 5, 2025

There's a conflict on Avalonia.nupkg.xml. Not sure why there are so many changes there! You should be able to completely revert this file since the API break has been reverted.

Copy link
Member

@MrJul MrJul left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@MrJul MrJul added api-approved The new public APIs have been approved. and removed api-change-requested The new public APIs need some changes. labels Dec 5, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

api-approved The new public APIs have been approved. area-rendering backport-candidate-11.3.x Consider this PR for backporting to 11.3 branch feature

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Feature] Add FillRule support to Polyline/Polygon

4 participants