Browse Source

Remove RoutedEventArgs.OriginalSource.

Still not entirely sure what it's purpose is in WPF.
Steven Kirk 10 years ago
parent
commit
c5020d38ee

+ 0 - 1
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]);

+ 1 - 1
src/Perspex.Input/InputElement.cs

@@ -349,7 +349,7 @@ namespace Perspex.Input
         /// <param name="e">The event args.</param>
         protected virtual void OnGotFocus(GotFocusEventArgs e)
         {
-            this.IsFocused = e.OriginalSource == this;
+            this.IsFocused = e.Source == this;
         }
 
         /// <summary>

+ 0 - 1
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);

+ 0 - 7
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,
                 };
 

+ 0 - 1
src/Perspex.Interactivity/Interactive.cs

@@ -125,7 +125,6 @@ namespace Perspex.Interactivity
             Contract.Requires<NullReferenceException>(e != null);
 
             e.Source = e.Source ?? this;
-            e.OriginalSource = e.OriginalSource ?? this;
 
             if (e.RoutedEvent.RoutingStrategies == RoutingStrategies.Direct)
             {

+ 1 - 3
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; }