workgroupengineering
5 years ago
committed by
GitHub
GitHub
38 changed files with 559 additions and 118 deletions
@ -0,0 +1,38 @@ |
|||
using System; |
|||
using System.Reactive.Disposables; |
|||
|
|||
namespace Avalonia.Controls.Mixins |
|||
{ |
|||
/// <summary>
|
|||
/// Extension methods associated with the IDisposable interface.
|
|||
/// </summary>
|
|||
public static class DisposableMixin |
|||
{ |
|||
/// <summary>
|
|||
/// Ensures the provided disposable is disposed with the specified <see cref="CompositeDisposable"/>.
|
|||
/// </summary>
|
|||
/// <typeparam name="T">
|
|||
/// The type of the disposable.
|
|||
/// </typeparam>
|
|||
/// <param name="item">
|
|||
/// The disposable we are going to want to be disposed by the CompositeDisposable.
|
|||
/// </param>
|
|||
/// <param name="compositeDisposable">
|
|||
/// The <see cref="CompositeDisposable"/> to which <paramref name="item"/> will be added.
|
|||
/// </param>
|
|||
/// <returns>
|
|||
/// The disposable.
|
|||
/// </returns>
|
|||
public static T DisposeWith<T>(this T item, CompositeDisposable compositeDisposable) |
|||
where T : IDisposable |
|||
{ |
|||
if (compositeDisposable is null) |
|||
{ |
|||
throw new ArgumentNullException(nameof(compositeDisposable)); |
|||
} |
|||
|
|||
compositeDisposable.Add(item); |
|||
return item; |
|||
} |
|||
} |
|||
} |
|||
@ -1,8 +1,13 @@ |
|||
using System; |
|||
|
|||
namespace Avalonia.Win32 |
|||
{ |
|||
static class PlatformConstants |
|||
public static class PlatformConstants |
|||
{ |
|||
public const string WindowHandleType = "HWND"; |
|||
public const string CursorHandleType = "HCURSOR"; |
|||
|
|||
public static readonly Version Windows8 = new Version(6, 2); |
|||
public static readonly Version Windows7 = new Version(6, 1); |
|||
} |
|||
} |
|||
|
|||
@ -0,0 +1,106 @@ |
|||
using Avalonia.Controls; |
|||
using Avalonia.Media; |
|||
using Avalonia.Media.TextFormatting; |
|||
using Avalonia.Platform; |
|||
using Avalonia.Utilities; |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.Globalization; |
|||
using System.Linq; |
|||
using System.Text; |
|||
using System.Threading.Tasks; |
|||
using Xunit; |
|||
using System.Runtime.InteropServices; |
|||
|
|||
#if AVALONIA_SKIA
|
|||
namespace Avalonia.Skia.RenderTests |
|||
#else
|
|||
|
|||
using Avalonia.Direct2D1.RenderTests; |
|||
|
|||
namespace Avalonia.Direct2D1.RenderTests.Media |
|||
#endif
|
|||
{ |
|||
public class TextLayoutTests : TestBase |
|||
{ |
|||
public TextLayoutTests() |
|||
: base(@"Media\TextFormatting\TextLayout") |
|||
{ |
|||
} |
|||
|
|||
[Fact] |
|||
public async Task TextLayout_Basic() |
|||
{ |
|||
// Skip test on OSX: text rendering is subtly different.
|
|||
if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) |
|||
return; |
|||
|
|||
var t = new TextLayout( |
|||
"Avalonia!", |
|||
new Typeface(TestFontFamily), |
|||
24, |
|||
Brushes.Black); |
|||
|
|||
var target = new Border |
|||
{ |
|||
Width = 200, |
|||
Height = 200, |
|||
Background = Brushes.White, |
|||
Child = new DrawnControl(c => |
|||
{ |
|||
var textRect = new Rect(t.Size); |
|||
var bounds = new Rect(0, 0, 200, 200); |
|||
var rect = bounds.CenterRect(textRect); |
|||
c.DrawRectangle(Brushes.Yellow, null, rect); |
|||
t.Draw(c, rect.Position); |
|||
}), |
|||
}; |
|||
|
|||
await RenderToFile(target); |
|||
CompareImages(); |
|||
} |
|||
|
|||
[Fact] |
|||
public async Task TextLayout_Rotated() |
|||
{ |
|||
// Skip test on OSX: text rendering is subtly different.
|
|||
if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) |
|||
return; |
|||
|
|||
var t = new TextLayout( |
|||
"Avalonia!", |
|||
new Typeface(TestFontFamily), |
|||
24, |
|||
Brushes.Black); |
|||
|
|||
var target = new Border |
|||
{ |
|||
Width = 200, |
|||
Height = 200, |
|||
Background = Brushes.White, |
|||
Child = new DrawnControl(c => |
|||
{ |
|||
var textRect = new Rect(t.Size); |
|||
var bounds = new Rect(0, 0, 200, 200); |
|||
var rect = bounds.CenterRect(textRect); |
|||
var rotate = Matrix.CreateTranslation(-100, -100) * |
|||
Matrix.CreateRotation(MathUtilities.Deg2Rad(90)) * |
|||
Matrix.CreateTranslation(100, 100); |
|||
using var transform = c.PushPreTransform(rotate); |
|||
c.DrawRectangle(Brushes.Yellow, null, rect); |
|||
t.Draw(c, rect.Position); |
|||
}), |
|||
}; |
|||
|
|||
await RenderToFile(target); |
|||
CompareImages(); |
|||
} |
|||
|
|||
private class DrawnControl : Control |
|||
{ |
|||
private readonly Action<DrawingContext> _render; |
|||
public DrawnControl(Action<DrawingContext> render) => _render = render; |
|||
public override void Render(DrawingContext context) => _render(context); |
|||
} |
|||
} |
|||
} |
|||
|
After Width: | Height: | Size: 2.1 KiB |
|
After Width: | Height: | Size: 2.6 KiB |
|
After Width: | Height: | Size: 2.0 KiB |
|
After Width: | Height: | Size: 2.4 KiB |
Loading…
Reference in new issue