Browse Source

Fixed CursorFactory.

pull/5337/head
José Pedro 6 years ago
parent
commit
e1bfe10f43
No known key found for this signature in database GPG Key ID: B8247B9301707B83
  1. 2
      src/Android/Avalonia.Android/AndroidPlatform.cs
  2. 17
      src/Android/Avalonia.Android/CursorFactory.cs
  3. 2
      src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs

2
src/Android/Avalonia.Android/AndroidPlatform.cs

@ -51,7 +51,7 @@ namespace Avalonia.Android
AvaloniaLocator.CurrentMutable
.Bind<IClipboard>().ToTransient<ClipboardImpl>()
.Bind<IStandardCursorFactory>().ToTransient<CursorFactory>()
.Bind<ICursorFactory>().ToTransient<CursorFactory>()
.Bind<IKeyboardDevice>().ToSingleton<AndroidKeyboardDevice>()
.Bind<IPlatformSettings>().ToConstant(Instance)
.Bind<IPlatformThreadingInterface>().ToConstant(new AndroidThreadingInterface())

17
src/Android/Avalonia.Android/CursorFactory.cs

@ -1,12 +1,21 @@
using System;
using Avalonia.Input;
using Avalonia.Platform;
namespace Avalonia.Android
{
internal class CursorFactory : IStandardCursorFactory
internal class CursorFactory : ICursorFactory
{
public IPlatformHandle GetCursor(StandardCursorType cursorType)
=> new PlatformHandle(IntPtr.Zero, "ZeroCursor");
public ICursorImpl CreateCursor(IBitmapImpl cursor, PixelPoint hotSpot) => CursorImpl.ZeroCursor;
public ICursorImpl GetCursor(StandardCursorType cursorType) => CursorImpl.ZeroCursor;
private sealed class CursorImpl : ICursorImpl
{
public static CursorImpl ZeroCursor { get; } = new CursorImpl();
private CursorImpl() { }
public void Dispose() { }
}
}
}

2
src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs

@ -123,7 +123,7 @@ namespace Avalonia.Android.Platform.SkiaPlatform
return PixelPoint.FromPoint(point, 1);
}
public void SetCursor(IPlatformHandle cursor)
public void SetCursor(ICursorImpl cursor)
{
//still not implemented
}

Loading…
Cancel
Save