Skip to content

#13492 - circle/ellipse should only select on their outline, not thei… #76

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.

Sign up for GitHub

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

Merged
Zeljko-Predjeskovic merged 3 commits into from
Jul 17, 2026
Merged

#13492 - circle/ellipse should only select on their outline, not thei… #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
acbbbc9
#13492- circle/ellipse should only select on their outline, not their…
Zeljko-Predjeskovic Jul 16, 2026
399148f
#13492 - fill-opacity/fill-rule-aware interior hit testing for filled…
Zeljko-Predjeskovic Jul 16, 2026
f7a0ed3
#13492 - fill-opacity must not affect whether a shape has an interior…
Zeljko-Predjeskovic Jul 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Svg.Editor.Avalonia.Forms/Svg.Editor.Avalon.Forms.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<LangVersion>latest</LangVersion>
<Version>3.2.0-optiq07</Version>
<Version>3.2.0-optiq08</Version>
<PackageReleaseNotes>
#3.2.0-optiq08
circle/ellipse should only select on their outline, not their bounding box
#3.2.0-optiq07
Tapping a point now only selects the top-most
#3.2.0-optiq06
Expand Down
4 changes: 3 additions & 1 deletion Svg.Editor.Avalonia.Views/Svg.Editor.Avalon.Views.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<LangVersion>latest</LangVersion>
<Version>3.2.0-optiq07</Version>
<Version>3.2.0-optiq08</Version>
<PackageReleaseNotes>
#3.2.0-optiq08
circle/ellipse should only select on their outline, not their bounding box
#3.2.0-optiq07
Tapping a point now only selects the top-most
#3.2.0-optiq06
Expand Down
73 changes: 73 additions & 0 deletions Svg.Editor.Core.Tests/SelectionToolTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,79 @@ public async Task ElementsAreSelected_AndDeleteCommandExecuted_ElementsAreRemove
Assert.AreEqual(0, Canvas.SelectedElements.Count);
}

[Test]
public async Task EllipseWithoutFillIsTappedInCenter_ShouldNotSelect()
{
// Arrange
await Canvas.EnsureInitialized();
var tool = Canvas.Tools.OfType<SelectionTool>().Single();
Canvas.ActiveTool = tool;
Canvas.ScreenWidth = 800;
Canvas.ScreenHeight = 500;

// this mirrors EllipseTool.CreateShape exactly
var ellipse = new SvgEllipse
{
Stroke = new SvgColourServer(Color.Create(0, 0, 0)),
Fill = SvgPaintServer.None,
StrokeWidth = new SvgUnit(SvgUnitType.Pixel, 5),
CenterX = new SvgUnit(SvgUnitType.Pixel, 400),
CenterY = new SvgUnit(SvgUnitType.Pixel, 250),
RadiusX = new SvgUnit(SvgUnitType.Pixel, 100),
RadiusY = new SvgUnit(SvgUnitType.Pixel, 60)
};
Canvas.Document.Children.Add(ellipse);

// Preassert
Assert.True(Canvas.Document.Children.Any(x => x == ellipse));

// Act
var pt1 = PointF.Create(400, 250);
await Canvas.OnEvent(new PointerEvent(EventType.PointerDown, pt1, pt1, pt1, 1));
await Canvas.OnEvent(new PointerEvent(EventType.PointerUp, pt1, pt1, pt1, 1));
((TestScheduler)SchedulerProvider.BackgroundScheduler).AdvanceBy(TimeSpan.FromSeconds(1).Ticks);

// Assert
Assert.AreEqual(0, Canvas.SelectedElements.Count);
}

[Test]
public async Task EllipseWithoutFillIsTappedOnBorder_ShouldSelect()
{
// Arrange
await Canvas.EnsureInitialized();
var tool = Canvas.Tools.OfType<SelectionTool>().Single();
Canvas.ActiveTool = tool;
Canvas.ScreenWidth = 800;
Canvas.ScreenHeight = 500;

// this mirrors EllipseTool.CreateShape exactly
var ellipse = new SvgEllipse
{
Stroke = new SvgColourServer(Color.Create(0, 0, 0)),
Fill = SvgPaintServer.None,
StrokeWidth = new SvgUnit(SvgUnitType.Pixel, 5),
CenterX = new SvgUnit(SvgUnitType.Pixel, 400),
CenterY = new SvgUnit(SvgUnitType.Pixel, 250),
RadiusX = new SvgUnit(SvgUnitType.Pixel, 100),
RadiusY = new SvgUnit(SvgUnitType.Pixel, 60)
};
Canvas.Document.Children.Add(ellipse);

// Preassert
Assert.True(Canvas.Document.Children.Any(x => x == ellipse));

// Act - tap on the top border of the ellipse (cy - ry)
var pt1 = PointF.Create(400, 190);
await Canvas.OnEvent(new PointerEvent(EventType.PointerDown, pt1, pt1, pt1, 1));
await Canvas.OnEvent(new PointerEvent(EventType.PointerUp, pt1, pt1, pt1, 1));
((TestScheduler)SchedulerProvider.BackgroundScheduler).AdvanceBy(TimeSpan.FromSeconds(1).Ticks);

// Assert
Assert.AreEqual(1, Canvas.SelectedElements.Count);
Assert.AreSame(ellipse, Canvas.SelectedElements.Single());
}

[Test]
public async Task PolygonIsSelectedInside_ShouldNotSelect()
{
Expand Down
4 changes: 3 additions & 1 deletion Svg.Editor.Core/Svg.Editor.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
<AssemblyName>Svg.Editor</AssemblyName>
<DefaultLanguage>en-US</DefaultLanguage>
<TargetFramework>net10.0</TargetFramework>
<Version>3.2.0-optiq07</Version>
<Version>3.2.0-optiq08</Version>
<LangVersion>latest</LangVersion>
<PackageReleaseNotes>
#3.2.0-optiq08
circle/ellipse should only select on their outline, not their bounding box
#3.2.0-optiq07
Tapping a point now only selects the top-most
#3.2.0-optiq06
Expand Down
Loading
Loading