Browse Source

Fixed name of PointerPressedEventArgs.

Steven Kirk 9 years ago
parent
commit
3e3134217c

+ 1 - 1
src/Perspex.Controls/Button.cs

@@ -211,7 +211,7 @@ namespace Perspex.Controls
         }
 
         /// <inheritdoc/>
-        protected override void OnPointerPressed(PointerPressEventArgs e)
+        protected override void OnPointerPressed(PointerPressedEventArgs e)
         {
             base.OnPointerPressed(e);
 

+ 1 - 1
src/Perspex.Controls/Carousel.cs

@@ -74,7 +74,7 @@ namespace Perspex.Controls
         }
 
         /// <inheritdoc/>
-        protected override void OnPointerPressed(PointerPressEventArgs e)
+        protected override void OnPointerPressed(PointerPressedEventArgs e)
         {
             // Ignore pointer presses.
         }

+ 1 - 1
src/Perspex.Controls/DropDown.cs

@@ -99,7 +99,7 @@ namespace Perspex.Controls
         }
 
         /// <inheritdoc/>
-        protected override void OnPointerPressed(PointerPressEventArgs e)
+        protected override void OnPointerPressed(PointerPressedEventArgs e)
         {
             if (!IsDropDownOpen && ((IVisual)e.Source).GetVisualRoot() != typeof(PopupRoot))
             {

+ 1 - 1
src/Perspex.Controls/ListBox.cs

@@ -59,7 +59,7 @@ namespace Perspex.Controls
         }
 
         /// <inheritdoc/>
-        protected override void OnPointerPressed(PointerPressEventArgs e)
+        protected override void OnPointerPressed(PointerPressedEventArgs e)
         {
             base.OnPointerPressed(e);
 

+ 1 - 1
src/Perspex.Controls/Menu.cs

@@ -211,7 +211,7 @@ namespace Perspex.Controls
         /// </summary>
         /// <param name="sender">The sender.</param>
         /// <param name="e">The event args.</param>
-        private void TopLevelPreviewPointerPress(object sender, PointerPressEventArgs e)
+        private void TopLevelPreviewPointerPress(object sender, PointerPressedEventArgs e)
         {
             if (IsOpen)
             {

+ 1 - 1
src/Perspex.Controls/MenuItem.cs

@@ -310,7 +310,7 @@ namespace Perspex.Controls
         /// Called when the pointer is pressed over the <see cref="MenuItem"/>.
         /// </summary>
         /// <param name="e">The event args.</param>
-        protected override void OnPointerPressed(PointerPressEventArgs e)
+        protected override void OnPointerPressed(PointerPressedEventArgs e)
         {
             base.OnPointerPressed(e);
 

+ 1 - 1
src/Perspex.Controls/Primitives/Popup.cs

@@ -288,7 +288,7 @@ namespace Perspex.Controls.Primitives
             }
         }
 
-        private void PointerPressedOutside(object sender, PointerPressEventArgs e)
+        private void PointerPressedOutside(object sender, PointerPressedEventArgs e)
         {
             if (!StaysOpen)
             {

+ 1 - 1
src/Perspex.Controls/Primitives/TabStrip.cs

@@ -35,7 +35,7 @@ namespace Perspex.Controls.Primitives
         }
 
         /// <inheritdoc/>
-        protected override void OnPointerPressed(PointerPressEventArgs e)
+        protected override void OnPointerPressed(PointerPressedEventArgs e)
         {
             base.OnPointerPressed(e);
 

+ 1 - 1
src/Perspex.Controls/Primitives/Thumb.cs

@@ -72,7 +72,7 @@ namespace Perspex.Controls.Primitives
             }
         }
 
-        protected override void OnPointerPressed(PointerPressEventArgs e)
+        protected override void OnPointerPressed(PointerPressedEventArgs e)
         {
             e.Device.Capture(this);
             _lastPoint = e.GetPosition(this);

+ 1 - 1
src/Perspex.Controls/TextBox.cs

@@ -355,7 +355,7 @@ namespace Perspex.Controls
             }
         }
 
-        protected override void OnPointerPressed(PointerPressEventArgs e)
+        protected override void OnPointerPressed(PointerPressedEventArgs e)
         {
             if (e.Source == _presenter)
             {

+ 1 - 1
src/Perspex.Controls/TreeView.cs

@@ -116,7 +116,7 @@ namespace Perspex.Controls
         }
 
         /// <inheritdoc/>
-        protected override void OnPointerPressed(PointerPressEventArgs e)
+        protected override void OnPointerPressed(PointerPressedEventArgs e)
         {
             base.OnPointerPressed(e);
 

+ 1 - 1
src/Perspex.HtmlRenderer/HtmlControl.cs

@@ -401,7 +401,7 @@ namespace Perspex.Controls.Html
         /// <summary>
         /// Handle mouse down to handle selection. 
         /// </summary>
-        protected override void OnPointerPressed(PointerPressEventArgs e)
+        protected override void OnPointerPressed(PointerPressedEventArgs e)
         {
             base.OnPointerPressed(e);
             LeftMouseButton = true;

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

@@ -175,7 +175,7 @@ namespace Perspex.Input
         {
             if (sender == e.Source)
             {
-                var ev = (PointerPressEventArgs)e;
+                var ev = (PointerPressedEventArgs)e;
                 var element = (ev.Device.Captured as IInputElement) ?? (e.Source as IInputElement);
 
                 if (element == null || !CanFocus(element))

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

@@ -51,7 +51,7 @@ namespace Perspex.Input
         /// <summary>
         /// Occurs when the pointer is pressed over the control.
         /// </summary>
-        event EventHandler<PointerPressEventArgs> PointerPressed;
+        event EventHandler<PointerPressedEventArgs> PointerPressed;
 
         /// <summary>
         /// Occurs when the pointer moves over the control.

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

@@ -116,8 +116,8 @@ namespace Perspex.Input
         /// <summary>
         /// Defines the <see cref="PointerPressed"/> event.
         /// </summary>
-        public static readonly RoutedEvent<PointerPressEventArgs> PointerPressedEvent =
-            RoutedEvent.Register<InputElement, PointerPressEventArgs>(
+        public static readonly RoutedEvent<PointerPressedEventArgs> PointerPressedEvent =
+            RoutedEvent.Register<InputElement, PointerPressedEventArgs>(
                 "PointerPressed",
                 RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
 
@@ -235,7 +235,7 @@ namespace Perspex.Input
         /// <summary>
         /// Occurs when the pointer is pressed over the control.
         /// </summary>
-        public event EventHandler<PointerPressEventArgs> PointerPressed
+        public event EventHandler<PointerPressedEventArgs> PointerPressed
         {
             add { AddHandler(PointerPressedEvent, value); }
             remove { RemoveHandler(PointerPressedEvent, value); }
@@ -437,7 +437,7 @@ namespace Perspex.Input
         /// Called before the <see cref="PointerPressed"/> event occurs.
         /// </summary>
         /// <param name="e">The event args.</param>
-        protected virtual void OnPointerPressed(PointerPressEventArgs e)
+        protected virtual void OnPointerPressed(PointerPressedEventArgs e)
         {
         }
 

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

@@ -167,7 +167,7 @@ namespace Perspex.Input
                     _lastClickRect = new Rect(p, new Size())
                         .Inflate(new Thickness(settings.DoubleClickSize.Width / 2, settings.DoubleClickSize.Height / 2));
 
-                    var e = new PointerPressEventArgs
+                    var e = new PointerPressedEventArgs
                     {
                         Device = this,
                         RoutedEvent = InputElement.PointerPressedEvent,

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

@@ -26,7 +26,7 @@ namespace Perspex.Input
         Middle
     }
 
-    public class PointerPressEventArgs : PointerEventArgs
+    public class PointerPressedEventArgs : PointerEventArgs
     {
         public int ClickCount { get; set; }
         public MouseButton MouseButton { get; set; }

+ 1 - 1
tests/Perspex.Controls.UnitTests/ListBoxTests.cs

@@ -115,7 +115,7 @@ namespace Perspex.Controls.UnitTests
 
             ApplyTemplate(target);
 
-            target.Presenter.Panel.Children[1].RaiseEvent(new PointerPressEventArgs
+            target.Presenter.Panel.Children[1].RaiseEvent(new PointerPressedEventArgs
             {
                 RoutedEvent = InputElement.PointerPressedEvent,
                 MouseButton = MouseButton.Left,

+ 6 - 6
tests/Perspex.Controls.UnitTests/ListBoxTests_Single.cs

@@ -65,7 +65,7 @@ namespace Perspex.Controls.UnitTests
 
             ApplyTemplate(target);
 
-            target.Presenter.Panel.Children[0].RaiseEvent(new PointerPressEventArgs
+            target.Presenter.Panel.Children[0].RaiseEvent(new PointerPressedEventArgs
             {
                 RoutedEvent = InputElement.PointerPressedEvent,
                 MouseButton = MouseButton.Left,
@@ -86,7 +86,7 @@ namespace Perspex.Controls.UnitTests
             ApplyTemplate(target);
             target.SelectedIndex = 0;
 
-            target.Presenter.Panel.Children[0].RaiseEvent(new PointerPressEventArgs
+            target.Presenter.Panel.Children[0].RaiseEvent(new PointerPressedEventArgs
             {
                 RoutedEvent = InputElement.PointerPressedEvent,
                 MouseButton = MouseButton.Left,
@@ -107,7 +107,7 @@ namespace Perspex.Controls.UnitTests
 
             ApplyTemplate(target);
 
-            target.Presenter.Panel.Children[0].RaiseEvent(new PointerPressEventArgs
+            target.Presenter.Panel.Children[0].RaiseEvent(new PointerPressedEventArgs
             {
                 RoutedEvent = InputElement.PointerPressedEvent,
                 MouseButton = MouseButton.Left,
@@ -129,7 +129,7 @@ namespace Perspex.Controls.UnitTests
             ApplyTemplate(target);
             target.SelectedIndex = 0;
 
-            target.Presenter.Panel.Children[0].RaiseEvent(new PointerPressEventArgs
+            target.Presenter.Panel.Children[0].RaiseEvent(new PointerPressedEventArgs
             {
                 RoutedEvent = InputElement.PointerPressedEvent,
                 MouseButton = MouseButton.Left,
@@ -151,7 +151,7 @@ namespace Perspex.Controls.UnitTests
             ApplyTemplate(target);
             target.SelectedIndex = 0;
 
-            target.Presenter.Panel.Children[0].RaiseEvent(new PointerPressEventArgs
+            target.Presenter.Panel.Children[0].RaiseEvent(new PointerPressedEventArgs
             {
                 RoutedEvent = InputElement.PointerPressedEvent,
                 MouseButton = MouseButton.Left,
@@ -173,7 +173,7 @@ namespace Perspex.Controls.UnitTests
             ApplyTemplate(target);
             target.SelectedIndex = 1;
 
-            target.Presenter.Panel.Children[0].RaiseEvent(new PointerPressEventArgs
+            target.Presenter.Panel.Children[0].RaiseEvent(new PointerPressedEventArgs
             {
                 RoutedEvent = InputElement.PointerPressedEvent,
                 MouseButton = MouseButton.Left,

+ 1 - 1
tests/Perspex.Controls.UnitTests/TreeViewTests.cs

@@ -98,7 +98,7 @@ namespace Perspex.Controls.UnitTests
 
             Assert.NotNull(container);
 
-            container.RaiseEvent(new PointerPressEventArgs
+            container.RaiseEvent(new PointerPressedEventArgs
             {
                 RoutedEvent = InputElement.PointerPressedEvent,
                 MouseButton = MouseButton.Left,