Skip to content

Commit 00d3e74

Browse files
committed
Improved styles support, Text decoration support in SVG Fonts and others
- CSS naming is now case-insensitive - Underline, Overline and strike-through are now supported in SVG Fonts - More improvements in thread safety - Renabled path parsing fall-back for WPF path-parsing to handle error paths - Improved styling support in use-elements; descendent and sibling styles - Added lists of constants; XML, CSS and SVG constants
1 parent 66ac78f commit 00d3e74

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+2178
-174
lines changed
0 Bytes
Binary file not shown.

Output/SharpVectors.Core.dll

48 KB
Binary file not shown.

Output/SharpVectors.Css.dll

0 Bytes
Binary file not shown.

Output/SharpVectors.Dom.dll

0 Bytes
Binary file not shown.

Output/SharpVectors.Model.dll

0 Bytes
Binary file not shown.

Output/SharpVectors.Rendering.Gdi.dll

12 KB
Binary file not shown.

Output/SharpVectors.Rendering.Wpf.dll

2 KB
Binary file not shown.

Output/SharpVectors.Runtime.Wpf.dll

5 KB
Binary file not shown.

Samples/WpfTestThreadSafety/MainWindow.xaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<DataTemplate>
5757
<StackPanel Margin="8,8,8,8" Orientation="Vertical" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
5858
<Image Source="{Binding Path=Image}" HorizontalAlignment="Center" VerticalAlignment="Center" Stretch="Uniform" Width="120" Height="120" />
59-
<TextBlock Text="{Binding Path=Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Width="120" />
59+
<TextBlock Text="{Binding Path=Name}" HorizontalAlignment="Center" VerticalAlignment="Center" Width="120" FontSize="10px" />
6060
</StackPanel>
6161
</DataTemplate>
6262
</ListView.ItemTemplate>

Samples/WpfTestThreadSafety/MainWindow.xaml.cs

+14-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
using System;
22
using System.IO;
3+
using System.Threading.Tasks;
4+
using System.Runtime.InteropServices;
35
using System.Collections.Generic;
46
using System.Collections.Concurrent;
57
using System.Collections.ObjectModel;
6-
using System.Threading.Tasks;
7-
using System.Runtime.InteropServices;
88

99
using System.Windows;
1010
using System.Windows.Media;
@@ -16,23 +16,32 @@ namespace WpfTestThreadSafety
1616
{
1717
public sealed class ImageData
1818
{
19+
private int _index;
1920
private string _fileName;
2021
private Drawing _drawing;
2122

2223
public ImageData()
2324
{
2425
}
2526

26-
public ImageData(Drawing drawing, string fileName)
27+
public ImageData(int index, Drawing drawing, string fileName)
2728
{
29+
_index = index;
2830
_drawing = drawing;
2931
_fileName = fileName;
3032
}
3133

34+
public int Index
35+
{
36+
get {
37+
return _index;
38+
}
39+
}
40+
3241
public string Name
3342
{
3443
get {
35-
return _fileName;
44+
return string.Format("{0:D3}: {1}" , _index + 1, _fileName);
3645
}
3746
}
3847

@@ -188,7 +197,7 @@ private void AppendImage(Drawing drawing, string fileName)
188197
{
189198
if (Dispatcher.CheckAccess())
190199
{
191-
_imageList.Add(new ImageData(drawing, fileName));
200+
_imageList.Add(new ImageData(_imageList.Count, drawing, fileName));
192201
}
193202
else
194203
{

Samples/WpfTestThreadSafety/WpfTestThreadSafety.csproj

+2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<DefineConstants>DEBUG;TRACE</DefineConstants>
2525
<ErrorReport>prompt</ErrorReport>
2626
<WarningLevel>4</WarningLevel>
27+
<Prefer32Bit>false</Prefer32Bit>
2728
</PropertyGroup>
2829
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2930
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -33,6 +34,7 @@
3334
<DefineConstants>TRACE</DefineConstants>
3435
<ErrorReport>prompt</ErrorReport>
3536
<WarningLevel>4</WarningLevel>
37+
<Prefer32Bit>false</Prefer32Bit>
3638
</PropertyGroup>
3739
<PropertyGroup>
3840
<ApplicationIcon>App.ico</ApplicationIcon>

Samples/WpfW3cSvgTestSuite/Output/SvgTestResults11.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<category label="Data Types" total="15" unknowns="0" failures="6" successes="6" partials="3" />
4343
<category label="Metadata and Others" total="7" unknowns="0" failures="2" successes="3" partials="2" />
4444
</result>
45-
<result version="1.5.0.0" date="2019-10-15T02:50:49.3071705+09:00">
45+
<result version="1.5.0.0" date="2019-10-29T04:20:38.8407419+09:00">
4646
<category label="Animations" total="78" unknowns="0" failures="78" successes="0" partials="0" />
4747
<category label="Colors" total="6" unknowns="0" failures="0" successes="5" partials="1" />
4848
<category label="Coordinates and Transforms" total="32" unknowns="0" failures="4" successes="28" partials="0" />
@@ -57,9 +57,9 @@
5757
<category label="Rendering" total="8" unknowns="0" failures="0" successes="8" partials="0" />
5858
<category label="Scripting" total="6" unknowns="0" failures="6" successes="0" partials="0" />
5959
<category label="Shapes" total="22" unknowns="0" failures="0" successes="22" partials="0" />
60-
<category label="Structures" total="72" unknowns="1" failures="31" successes="35" partials="5" />
61-
<category label="Styling" total="18" unknowns="0" failures="7" successes="10" partials="1" />
62-
<category label="Text" total="62" unknowns="0" failures="10" successes="24" partials="28" />
60+
<category label="Structures" total="72" unknowns="1" failures="31" successes="36" partials="4" />
61+
<category label="Styling" total="18" unknowns="0" failures="2" successes="16" partials="0" />
62+
<category label="Text" total="62" unknowns="0" failures="10" successes="31" partials="21" />
6363
<category label="Data Types" total="15" unknowns="0" failures="6" successes="6" partials="3" />
6464
<category label="Metadata and Others" total="7" unknowns="0" failures="2" successes="3" partials="2" />
6565
</result>

0 commit comments

Comments
 (0)