Browse Source

MouseDevice now exposed on TopLevel.

pull/827/head
Steven Kirk 9 years ago
parent
commit
2edcdb8656
  1. 7
      tests/Avalonia.Input.UnitTests/MouseDeviceTests.cs

7
tests/Avalonia.Input.UnitTests/MouseDeviceTests.cs

@ -20,7 +20,6 @@ namespace Avalonia.Input.UnitTests
using (TestApplication(renderer.Object)) using (TestApplication(renderer.Object))
{ {
var inputManager = InputManager.Instance; var inputManager = InputManager.Instance;
var mouseDevice = AvaloniaLocator.Current.GetService<IMouseDevice>();
Canvas canvas; Canvas canvas;
Border border; Border border;
@ -28,6 +27,7 @@ namespace Avalonia.Input.UnitTests
var root = new TestRoot var root = new TestRoot
{ {
MouseDevice = new MouseDevice(),
Child = new Panel Child = new Panel
{ {
Children = Children =
@ -45,7 +45,7 @@ namespace Avalonia.Input.UnitTests
.Returns(new[] { decorator }); .Returns(new[] { decorator });
inputManager.ProcessInput(new RawMouseEventArgs( inputManager.ProcessInput(new RawMouseEventArgs(
mouseDevice, root.MouseDevice,
0, 0,
root, root,
RawMouseEventType.Move, RawMouseEventType.Move,
@ -61,7 +61,7 @@ namespace Avalonia.Input.UnitTests
.Returns(new[] { canvas }); .Returns(new[] { canvas });
inputManager.ProcessInput(new RawMouseEventArgs( inputManager.ProcessInput(new RawMouseEventArgs(
mouseDevice, root.MouseDevice,
0, 0,
root, root,
RawMouseEventType.Move, RawMouseEventType.Move,
@ -80,7 +80,6 @@ namespace Avalonia.Input.UnitTests
return UnitTestApplication.Start( return UnitTestApplication.Start(
new TestServices( new TestServices(
inputManager: new InputManager(), inputManager: new InputManager(),
mouseDevice: () => new MouseDevice(),
renderer: (root, loop) => renderer)); renderer: (root, loop) => renderer));
} }
} }

Loading…
Cancel
Save