Browse Source

Compilation fixes

pull/950/merge
Nikita Tsukanov 9 years ago
parent
commit
d2fb209acf
  1. 2
      src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidTouchEventsHelper.cs
  2. 2
      src/Windows/Avalonia.Win32/Input/WindowsMouseDevice.cs

2
src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidTouchEventsHelper.cs

@ -71,7 +71,7 @@ namespace Avalonia.Android.Platform.Specific.Helpers
if (x <= _point.X && r >= _point.X && y <= _point.Y && b >= _point.Y) if (x <= _point.X && r >= _point.X && y <= _point.Y && b >= _point.Y)
{ {
var inputRoot = _getInputRoot(); var inputRoot = _getInputRoot();
var mouseDevice = MouseDevice.Instance; var mouseDevice = Avalonia.Android.Platform.Input.AndroidMouseDevice.Instance;
//in order the controls to work in a predictable way //in order the controls to work in a predictable way
//we need to generate mouse move before first mouse down event //we need to generate mouse move before first mouse down event

2
src/Windows/Avalonia.Win32/Input/WindowsMouseDevice.cs

@ -10,7 +10,7 @@ namespace Avalonia.Win32.Input
{ {
class WindowsMouseDevice : MouseDevice class WindowsMouseDevice : MouseDevice
{ {
public new static WindowsMouseDevice Instance { get; } = new WindowsMouseDevice(); public static WindowsMouseDevice Instance { get; } = new WindowsMouseDevice();
public WindowImpl CurrentWindow public WindowImpl CurrentWindow
{ {

Loading…
Cancel
Save