diff --git a/Tests/Perspex.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs b/Tests/Perspex.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
index d0ac23e29a..31e014e69c 100644
--- a/Tests/Perspex.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
+++ b/Tests/Perspex.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
@@ -488,7 +488,6 @@ namespace Perspex.Controls.UnitTests.Primitives
{
RoutedEvent = SelectingItemsControl.IsSelectedChangedEvent,
Source = notChild,
- OriginalSource = notChild,
});
Assert.Equal(target.SelectedItem, items[1]);
diff --git a/src/Perspex.Input/InputElement.cs b/src/Perspex.Input/InputElement.cs
index 2747de475e..1743926e0f 100644
--- a/src/Perspex.Input/InputElement.cs
+++ b/src/Perspex.Input/InputElement.cs
@@ -349,7 +349,7 @@ namespace Perspex.Input
/// The event args.
protected virtual void OnGotFocus(GotFocusEventArgs e)
{
- this.IsFocused = e.OriginalSource == this;
+ this.IsFocused = e.Source == this;
}
///
diff --git a/src/Perspex.Input/KeyboardDevice.cs b/src/Perspex.Input/KeyboardDevice.cs
index 3dfc451171..d9f7c2c9f9 100644
--- a/src/Perspex.Input/KeyboardDevice.cs
+++ b/src/Perspex.Input/KeyboardDevice.cs
@@ -113,7 +113,6 @@ namespace Perspex.Input
Key = e.Key,
Text = e.Text,
Source = element,
- OriginalSource = element,
};
element.RaiseEvent(ev);
diff --git a/src/Perspex.Input/MouseDevice.cs b/src/Perspex.Input/MouseDevice.cs
index 592cfef876..738c5ca959 100644
--- a/src/Perspex.Input/MouseDevice.cs
+++ b/src/Perspex.Input/MouseDevice.cs
@@ -133,7 +133,6 @@ namespace Perspex.Input
{
Device = this,
RoutedEvent = InputElement.PointerPressedEvent,
- OriginalSource = source,
Source = source,
ClickCount = this.clickCount,
};
@@ -171,7 +170,6 @@ namespace Perspex.Input
{
Device = this,
RoutedEvent = InputElement.PointerMovedEvent,
- OriginalSource = source,
Source = source,
});
}
@@ -191,7 +189,6 @@ namespace Perspex.Input
{
Device = this,
RoutedEvent = InputElement.PointerReleasedEvent,
- OriginalSource = source,
Source = source,
});
}
@@ -212,7 +209,6 @@ namespace Perspex.Input
{
Device = this,
RoutedEvent = InputElement.PointerWheelChangedEvent,
- OriginalSource = source,
Source = source,
Delta = delta,
});
@@ -240,7 +236,6 @@ namespace Perspex.Input
{
RoutedEvent = InputElement.PointerLeaveEvent,
Device = device,
- OriginalSource = control,
Source = control,
};
@@ -259,7 +254,6 @@ namespace Perspex.Input
{
RoutedEvent = InputElement.PointerLeaveEvent,
Device = device,
- OriginalSource = control,
Source = control,
};
@@ -273,7 +267,6 @@ namespace Perspex.Input
{
RoutedEvent = InputElement.PointerEnterEvent,
Device = device,
- OriginalSource = control,
Source = control,
};
diff --git a/src/Perspex.Interactivity/Interactive.cs b/src/Perspex.Interactivity/Interactive.cs
index e5c94d01f1..8e598a315e 100644
--- a/src/Perspex.Interactivity/Interactive.cs
+++ b/src/Perspex.Interactivity/Interactive.cs
@@ -125,7 +125,6 @@ namespace Perspex.Interactivity
Contract.Requires(e != null);
e.Source = e.Source ?? this;
- e.OriginalSource = e.OriginalSource ?? this;
if (e.RoutedEvent.RoutingStrategies == RoutingStrategies.Direct)
{
diff --git a/src/Perspex.Interactivity/RoutedEventArgs.cs b/src/Perspex.Interactivity/RoutedEventArgs.cs
index d050bffc9b..4ab371c7ed 100644
--- a/src/Perspex.Interactivity/RoutedEventArgs.cs
+++ b/src/Perspex.Interactivity/RoutedEventArgs.cs
@@ -22,13 +22,11 @@ namespace Perspex.Interactivity
public RoutedEventArgs(RoutedEvent routedEvent, IInteractive source)
{
this.RoutedEvent = routedEvent;
- this.Source = this.OriginalSource = source;
+ this.Source = source;
}
public bool Handled { get; set; }
- public IInteractive OriginalSource { get; set; }
-
public RoutedEvent RoutedEvent { get; set; }
public RoutingStrategies Route { get; set; }