Browse Source

Merge pull request #6581 from Gillibald/fixes/6577

Fixes PathMarkupParser flag parsing when no separator is used
release/0.10.8
Benedikt Stebner 4 years ago
committed by Steven Kirk
parent
commit
7d4ead24d7
  1. 10
      src/Avalonia.Visuals/Media/PathMarkupParser.cs
  2. 23
      tests/Avalonia.Visuals.UnitTests/Media/PathMarkupParserTests.cs

10
src/Avalonia.Visuals/Media/PathMarkupParser.cs

@ -496,12 +496,18 @@ namespace Avalonia.Media
private bool ReadBool(ref ReadOnlySpan<char> span)
{
if (!ReadArgument(ref span, out var boolValue) || boolValue.Length != 1)
span = SkipWhitespace(span);
if (span.IsEmpty)
{
throw new InvalidDataException("Invalid bool rule.");
}
switch (boolValue[0])
var c = span[0];
span = span.Slice(1);
switch (c)
{
case '0':
return false;

23
tests/Avalonia.Visuals.UnitTests/Media/PathMarkupParserTests.cs

@ -297,5 +297,28 @@ namespace Avalonia.Visuals.UnitTests.Media
Assert.Equal(new Point(20, 20), figure.StartPoint);
}
}
[Fact]
public void Should_Parse_Flags_Without_Separator()
{
var pathGeometry = new PathGeometry();
using (var context = new PathGeometryContext(pathGeometry))
using (var parser = new PathMarkupParser(context))
{
parser.Parse("a.898.898 0 01.27.188");
var figure = pathGeometry.Figures[0];
var segments = figure.Segments;
Assert.NotNull(segments);
Assert.Equal(1, segments.Count);
var arcSegment = segments[0];
Assert.IsType<ArcSegment>(arcSegment);
}
}
}
}

Loading…
Cancel
Save