Skip to content

Commit 52f20cf

Browse files
committed
Further simplification
1 parent cc33917 commit 52f20cf

File tree

14 files changed

+7
-278
lines changed

14 files changed

+7
-278
lines changed

CSharpMath.Editor.Tests/CSharpMath.Editor.Tests.csproj

Lines changed: 0 additions & 1 deletion
This file was deleted.

CSharpMath.Editor/CSharpMath.Editor.csproj

Lines changed: 0 additions & 10 deletions
This file was deleted.

CSharpMath.Rendering.Tests/CSharpMath.Rendering.Tests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
<ProjectReference Include="..\CSharpMath.Avalonia\CSharpMath.Avalonia.csproj" />
55
<ProjectReference Include="..\CSharpMath.SkiaSharp\CSharpMath.SkiaSharp.csproj" />
66
<PackageReference Include="SkiaSharp" Version="3.119.1" />
7-
<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="3.119.1" />
8-
<PackageReference Include="SkiaSharp.NativeAssets.Win32" Version="3.119.1" />
9-
<PackageReference Include="SkiaSharp.NativeAssets.macOS" Version="3.119.1" />
7+
<PackageReference Condition="$([MSBuild]::IsOSPlatform('linux'))" Include="SkiaSharp.NativeAssets.Linux" Version="3.119.1" />
8+
<PackageReference Condition="$([MSBuild]::IsOSPlatform('windows'))" Include="SkiaSharp.NativeAssets.Win32" Version="3.119.1" />
9+
<PackageReference Condition="$([MSBuild]::IsOSPlatform('macos'))" Include="SkiaSharp.NativeAssets.macOS" Version="3.119.1" />
1010
<PackageReference Include="Avalonia.Skia" Version="$(AvaloniaVersion)" />
1111
</ItemGroup>
1212
</Project>

CSharpMath.Rendering.Tests/TestMeasure.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ class D : Display.IDisplay<Fonts, Glyph> {
2020
public void Draw(IGraphicsContext<Fonts, Glyph> context) => throw new NotImplementedException();
2121
public void SetTextColorRecursive(Color? textColor) => throw new NotImplementedException();
2222
}
23-
class DEditorKeyboard : Editor.MathKeyboard<Fonts, Glyph> {
24-
public DEditorKeyboard() : base(TypesettingContext.Instance, new Fonts(Enumerable.Empty<Typography.OpenFont.Typeface>(), 0.0f)) =>
23+
class DKeyboard : Editor.MathKeyboard<Fonts, Glyph> {
24+
public DKeyboard() : base(TypesettingContext.Instance, new Fonts(Enumerable.Empty<Typography.OpenFont.Typeface>(), 0.0f)) =>
2525
Display = new Display.Displays.ListDisplay<Fonts, Glyph>(new[] { new D() });
2626
}
2727
class DRenderingMath : SkiaSharp.MathPainter {
@@ -39,13 +39,13 @@ public DRenderingKeyboard() =>
3939
Display = new Display.Displays.ListDisplay<Fonts, Glyph>(new[] { new D() });
4040
}
4141
/// <summary>
42-
/// CSharpMath and CSharpMath.Editor use the mathematical coordinate system,
42+
/// CSharpMath uses the mathematical coordinate system,
4343
/// i.e. the rectangle position is at the bottom-left.
4444
/// </summary>
4545
[Fact]
4646
public void CoreMeasure_YIsNegDescent() {
4747
Assert.Equal(new RectangleF(0, -3, 10, 15), new D().DisplayBounds());
48-
Assert.Equal(new RectangleF(0, -3, 10, 15), new DEditorKeyboard().Measure);
48+
Assert.Equal(new RectangleF(0, -3, 10, 15), new DKeyboard().Measure);
4949
}
5050
/// <summary>
5151
/// CSharpMath.Rendering and descendants use the graphical coordinate system,

CSharpMath.TestUtils/ApproximateAssertions.cs

Lines changed: 0 additions & 62 deletions
This file was deleted.

CSharpMath.TestUtils/CSharpMath.CoreTestUtils.csproj

Lines changed: 0 additions & 20 deletions
This file was deleted.

CSharpMath.TestUtils/FrontEnd/TestFont.cs

Lines changed: 0 additions & 6 deletions
This file was deleted.

CSharpMath.TestUtils/FrontEnd/TestFontMeasurer.cs

Lines changed: 0 additions & 9 deletions
This file was deleted.

CSharpMath.TestUtils/FrontEnd/TestGlyphBoundsProvider.cs

Lines changed: 0 additions & 65 deletions
This file was deleted.

CSharpMath.TestUtils/FrontEnd/TestGlyphFinder.cs

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)