Browse Source
# Conflicts: # src/Avalonia.Base/Animation/AnimationInstance`1.cs # src/Avalonia.Base/Data/InstancedBinding.cspull/9749/head
Max Katz
4 years ago
55 changed files with 804 additions and 193 deletions
@ -1,5 +0,0 @@ |
|||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
|||
<ItemGroup> |
|||
<PackageReference Include="JetBrains.Annotations" Version="10.3.0" /> |
|||
</ItemGroup> |
|||
</Project> |
|||
@ -0,0 +1,212 @@ |
|||
using System; |
|||
using System.Numerics; |
|||
using Avalonia; |
|||
using Avalonia.Controls; |
|||
using Avalonia.Input; |
|||
using Avalonia.LogicalTree; |
|||
using Avalonia.Markup.Xaml; |
|||
using Avalonia.Rendering.Composition; |
|||
|
|||
namespace ControlCatalog.Pages |
|||
{ |
|||
public class GesturePage : UserControl |
|||
{ |
|||
private bool _isInit; |
|||
private float _currentScale; |
|||
|
|||
public GesturePage() |
|||
{ |
|||
this.InitializeComponent(); |
|||
} |
|||
|
|||
private void InitializeComponent() |
|||
{ |
|||
AvaloniaXamlLoader.Load(this); |
|||
} |
|||
|
|||
protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e) |
|||
{ |
|||
base.OnAttachedToVisualTree(e); |
|||
|
|||
if(_isInit) |
|||
{ |
|||
return; |
|||
} |
|||
|
|||
_isInit = true; |
|||
|
|||
SetPullHandlers(this.Find<Border>("TopPullZone"), false); |
|||
SetPullHandlers(this.Find<Border>("BottomPullZone"), true); |
|||
SetPullHandlers(this.Find<Border>("RightPullZone"), true); |
|||
SetPullHandlers(this.Find<Border>("LeftPullZone"), false); |
|||
|
|||
var image = this.Find<Image>("PinchImage"); |
|||
SetPinchHandlers(image); |
|||
|
|||
var reset = this.Find<Button>("ResetButton"); |
|||
|
|||
reset!.Click += (s, e) => |
|||
{ |
|||
var compositionVisual = ElementComposition.GetElementVisual(image); |
|||
|
|||
if(compositionVisual!= null) |
|||
{ |
|||
_currentScale = 1; |
|||
compositionVisual.Scale = new Vector3(1,1,1); |
|||
image.InvalidateMeasure(); |
|||
} |
|||
}; |
|||
|
|||
} |
|||
|
|||
private void SetPinchHandlers(Control? control) |
|||
{ |
|||
if (control == null) |
|||
{ |
|||
return; |
|||
} |
|||
|
|||
_currentScale = 1; |
|||
Vector3 currentOffset = default; |
|||
bool isZooming = false; |
|||
|
|||
CompositionVisual? compositionVisual = null; |
|||
|
|||
void InitComposition(Control visual) |
|||
{ |
|||
if (compositionVisual != null) |
|||
{ |
|||
return; |
|||
} |
|||
|
|||
compositionVisual = ElementComposition.GetElementVisual(visual); |
|||
} |
|||
|
|||
control.LayoutUpdated += (s, e) => |
|||
{ |
|||
InitComposition(control!); |
|||
if (compositionVisual != null) |
|||
{ |
|||
compositionVisual.Scale = new(_currentScale, _currentScale, 1); |
|||
|
|||
if(currentOffset == default) |
|||
{ |
|||
currentOffset = compositionVisual.Offset; |
|||
} |
|||
} |
|||
}; |
|||
|
|||
control.AddHandler(Gestures.PinchEvent, (s, e) => |
|||
{ |
|||
InitComposition(control!); |
|||
|
|||
isZooming = true; |
|||
|
|||
if(compositionVisual != null) |
|||
{ |
|||
var scale = _currentScale * (float)e.Scale; |
|||
|
|||
compositionVisual.Scale = new(scale, scale, 1); |
|||
} |
|||
}); |
|||
|
|||
control.AddHandler(Gestures.PinchEndedEvent, (s, e) => |
|||
{ |
|||
InitComposition(control!); |
|||
|
|||
isZooming = false; |
|||
|
|||
if (compositionVisual != null) |
|||
{ |
|||
_currentScale = compositionVisual.Scale.X; |
|||
} |
|||
}); |
|||
|
|||
control.AddHandler(Gestures.ScrollGestureEvent, (s, e) => |
|||
{ |
|||
InitComposition(control!); |
|||
|
|||
if (compositionVisual != null && !isZooming) |
|||
{ |
|||
currentOffset -= new Vector3((float)e.Delta.X, (float)e.Delta.Y, 0); |
|||
|
|||
compositionVisual.Offset = currentOffset; |
|||
} |
|||
}); |
|||
} |
|||
|
|||
private void SetPullHandlers(Control? control, bool inverse) |
|||
{ |
|||
if (control == null) |
|||
{ |
|||
return; |
|||
} |
|||
|
|||
var ball = control.FindLogicalDescendantOfType<Border>(); |
|||
|
|||
Vector3 defaultOffset = default; |
|||
|
|||
CompositionVisual? ballCompositionVisual = null; |
|||
|
|||
if (ball != null) |
|||
{ |
|||
InitComposition(ball); |
|||
} |
|||
else |
|||
{ |
|||
return; |
|||
} |
|||
|
|||
control.LayoutUpdated += (s, e) => |
|||
{ |
|||
InitComposition(ball!); |
|||
if (ballCompositionVisual != null) |
|||
{ |
|||
defaultOffset = ballCompositionVisual.Offset; |
|||
} |
|||
}; |
|||
|
|||
control.AddHandler(Gestures.PullGestureEvent, (s, e) => |
|||
{ |
|||
Vector3 center = new((float)control.Bounds.Center.X, (float)control.Bounds.Center.Y, 0); |
|||
InitComposition(ball!); |
|||
if (ballCompositionVisual != null) |
|||
{ |
|||
ballCompositionVisual.Offset = defaultOffset + new System.Numerics.Vector3((float)e.Delta.X * 0.4f, (float)e.Delta.Y * 0.4f, 0) * (inverse ? -1 : 1); |
|||
} |
|||
}); |
|||
|
|||
control.AddHandler(Gestures.PullGestureEndedEvent, (s, e) => |
|||
{ |
|||
InitComposition(ball!); |
|||
if (ballCompositionVisual != null) |
|||
{ |
|||
ballCompositionVisual.Offset = defaultOffset; |
|||
} |
|||
}); |
|||
|
|||
void InitComposition(Control control) |
|||
{ |
|||
if (ballCompositionVisual != null) |
|||
{ |
|||
return; |
|||
} |
|||
|
|||
ballCompositionVisual = ElementComposition.GetElementVisual(ball); |
|||
|
|||
if (ballCompositionVisual != null) |
|||
{ |
|||
var offsetAnimation = ballCompositionVisual.Compositor.CreateVector3KeyFrameAnimation(); |
|||
offsetAnimation.Target = "Offset"; |
|||
offsetAnimation.InsertExpressionKeyFrame(1.0f, "this.FinalValue"); |
|||
offsetAnimation.Duration = TimeSpan.FromMilliseconds(100); |
|||
|
|||
var implicitAnimations = ballCompositionVisual.Compositor.CreateImplicitAnimationCollection(); |
|||
implicitAnimations["Offset"] = offsetAnimation; |
|||
|
|||
ballCompositionVisual.ImplicitAnimations = implicitAnimations; |
|||
} |
|||
} |
|||
} |
|||
} |
|||
} |
|||
@ -0,0 +1,117 @@ |
|||
<UserControl xmlns="https://github.com/avaloniaui" |
|||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" |
|||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" |
|||
d:DesignHeight="800" |
|||
d:DesignWidth="400" |
|||
x:Class="ControlCatalog.Pages.GesturePage"> |
|||
<StackPanel Orientation="Vertical" |
|||
Spacing="4"> |
|||
<TextBlock FontWeight="Bold" |
|||
FontSize="18" |
|||
Margin="5">Pull Gexture (Touch / Pen)</TextBlock> |
|||
<TextBlock Margin="5">Pull from colored rectangles</TextBlock> |
|||
<Border> |
|||
<DockPanel HorizontalAlignment="Stretch" |
|||
ClipToBounds="True" |
|||
Margin="5" |
|||
Height="200"> |
|||
<Border DockPanel.Dock="Top" |
|||
Margin="2" |
|||
Name="TopPullZone" |
|||
Background="Transparent" |
|||
BorderBrush="Red" |
|||
HorizontalAlignment="Stretch" |
|||
Height="50" |
|||
BorderThickness="1"> |
|||
<Border.GestureRecognizers> |
|||
<PullGestureRecognizer PullDirection="TopToBottom"/> |
|||
</Border.GestureRecognizers> |
|||
<Border Width="10" |
|||
Height="10" |
|||
HorizontalAlignment="Center" |
|||
VerticalAlignment="Center" |
|||
CornerRadius="5" |
|||
Name="TopBall" |
|||
Background="Green"/> |
|||
</Border> |
|||
<Border DockPanel.Dock="Bottom" |
|||
BorderBrush="Green" |
|||
Margin="2" |
|||
Background="Transparent" |
|||
Name="BottomPullZone" |
|||
HorizontalAlignment="Stretch" |
|||
Height="50" |
|||
BorderThickness="1"> |
|||
<Border.GestureRecognizers> |
|||
<PullGestureRecognizer PullDirection="BottomToTop"/> |
|||
</Border.GestureRecognizers> |
|||
<Border Width="10" |
|||
Name="BottomBall" |
|||
HorizontalAlignment="Center" |
|||
VerticalAlignment="Center" |
|||
Height="10" |
|||
CornerRadius="5" |
|||
Background="Green"/> |
|||
</Border> |
|||
<Border DockPanel.Dock="Right" |
|||
Margin="2" |
|||
Background="Transparent" |
|||
Name="RightPullZone" |
|||
BorderBrush="Blue" |
|||
HorizontalAlignment="Right" |
|||
VerticalAlignment="Stretch" |
|||
Width="50" |
|||
BorderThickness="1"> |
|||
<Border.GestureRecognizers> |
|||
<PullGestureRecognizer PullDirection="RightToLeft"/> |
|||
</Border.GestureRecognizers> |
|||
<Border Width="10" |
|||
Height="10" |
|||
Name="RightBall" |
|||
HorizontalAlignment="Center" |
|||
VerticalAlignment="Center" |
|||
CornerRadius="5" |
|||
Background="Green"/> |
|||
|
|||
</Border> |
|||
<Border DockPanel.Dock="Left" |
|||
Margin="2" |
|||
Background="Transparent" |
|||
Name="LeftPullZone" |
|||
BorderBrush="Orange" |
|||
HorizontalAlignment="Left" |
|||
VerticalAlignment="Stretch" |
|||
Width="50" |
|||
BorderThickness="1"> |
|||
<Border.GestureRecognizers> |
|||
<PullGestureRecognizer PullDirection="LeftToRight"/> |
|||
</Border.GestureRecognizers> |
|||
<Border Width="10" |
|||
Height="10" |
|||
Name="LeftBall" |
|||
HorizontalAlignment="Center" |
|||
VerticalAlignment="Center" |
|||
CornerRadius="5" |
|||
Background="Green"/> |
|||
|
|||
</Border> |
|||
</DockPanel> |
|||
</Border> |
|||
|
|||
<TextBlock FontWeight="Bold" |
|||
FontSize="18" |
|||
Margin="5">Pinch/Zoom Gexture (Multi Touch)</TextBlock> |
|||
<Border ClipToBounds="True"> |
|||
<Image Stretch="UniformToFill" |
|||
Margin="5" |
|||
Name="PinchImage" |
|||
Source="/Assets/delicate-arch-896885_640.jpg"> |
|||
<Image.GestureRecognizers> |
|||
<PinchGestureRecognizer/> |
|||
<ScrollGestureRecognizer CanHorizontallyScroll="True" CanVerticallyScroll="True"/> |
|||
</Image.GestureRecognizers> |
|||
</Image> |
|||
</Border> |
|||
<Button HorizontalAlignment="Center" Name="ResetButton">Reset</Button> |
|||
</StackPanel> |
|||
</UserControl> |
|||
@ -1,34 +0,0 @@ |
|||
using System; |
|||
using System.Runtime.CompilerServices; |
|||
using JetBrains.Annotations; |
|||
|
|||
namespace Avalonia |
|||
{ |
|||
/// <summary>
|
|||
/// A stub of Code Contract's Contract class.
|
|||
/// </summary>
|
|||
/// <remarks>
|
|||
/// It would be nice to use Code Contracts on Avalonia but last time I tried it slowed things
|
|||
/// to a crawl and often crashed. Instead use the same signature for checking preconditions
|
|||
/// in the hope that it might become usable at some point.
|
|||
/// </remarks>
|
|||
public static class Contract |
|||
{ |
|||
/// <summary>
|
|||
/// Specifies a precondition.
|
|||
/// </summary>
|
|||
/// <typeparam name="TException">
|
|||
/// The exception to throw if <paramref name="condition"/> is false.
|
|||
/// </typeparam>
|
|||
/// <param name="condition">The precondition.</param>
|
|||
[MethodImpl(MethodImplOptions.AggressiveInlining)] |
|||
[ContractAnnotation("condition:false=>stop")] |
|||
public static void Requires<TException>(bool condition) where TException : Exception, new() |
|||
{ |
|||
if (!condition) |
|||
{ |
|||
throw new TException(); |
|||
} |
|||
} |
|||
} |
|||
} |
|||
@ -0,0 +1,128 @@ |
|||
using Avalonia.Input.GestureRecognizers; |
|||
|
|||
namespace Avalonia.Input |
|||
{ |
|||
public class PinchGestureRecognizer : StyledElement, IGestureRecognizer |
|||
{ |
|||
private IInputElement? _target; |
|||
private IGestureRecognizerActionsDispatcher? _actions; |
|||
private float _initialDistance; |
|||
private IPointer? _firstContact; |
|||
private Point _firstPoint; |
|||
private IPointer? _secondContact; |
|||
private Point _secondPoint; |
|||
private Point _origin; |
|||
|
|||
public void Initialize(IInputElement target, IGestureRecognizerActionsDispatcher actions) |
|||
{ |
|||
_target = target; |
|||
_actions = actions; |
|||
} |
|||
|
|||
private void OnPointerPressed(object? sender, PointerPressedEventArgs e) |
|||
{ |
|||
PointerPressed(e); |
|||
} |
|||
|
|||
private void OnPointerReleased(object? sender, PointerReleasedEventArgs e) |
|||
{ |
|||
PointerReleased(e); |
|||
} |
|||
|
|||
public void PointerCaptureLost(IPointer pointer) |
|||
{ |
|||
RemoveContact(pointer); |
|||
} |
|||
|
|||
public void PointerMoved(PointerEventArgs e) |
|||
{ |
|||
if (_target != null && _target is Visual visual) |
|||
{ |
|||
if(_firstContact == e.Pointer) |
|||
{ |
|||
_firstPoint = e.GetPosition(visual); |
|||
} |
|||
else if (_secondContact == e.Pointer) |
|||
{ |
|||
_secondPoint = e.GetPosition(visual); |
|||
} |
|||
else |
|||
{ |
|||
return; |
|||
} |
|||
|
|||
if (_firstContact != null && _secondContact != null) |
|||
{ |
|||
var distance = GetDistance(_firstPoint, _secondPoint); |
|||
|
|||
var scale = distance / _initialDistance; |
|||
|
|||
_target?.RaiseEvent(new PinchEventArgs(scale, _origin)); |
|||
} |
|||
} |
|||
} |
|||
|
|||
public void PointerPressed(PointerPressedEventArgs e) |
|||
{ |
|||
if (_target != null && _target is Visual visual && (e.Pointer.Type == PointerType.Touch || e.Pointer.Type == PointerType.Pen)) |
|||
{ |
|||
if (_firstContact == null) |
|||
{ |
|||
_firstContact = e.Pointer; |
|||
_firstPoint = e.GetPosition(visual); |
|||
|
|||
return; |
|||
} |
|||
else if (_secondContact == null && _firstContact != e.Pointer) |
|||
{ |
|||
_secondContact = e.Pointer; |
|||
_secondPoint = e.GetPosition(visual); |
|||
} |
|||
else |
|||
{ |
|||
return; |
|||
} |
|||
|
|||
if (_firstContact != null && _secondContact != null) |
|||
{ |
|||
_initialDistance = GetDistance(_firstPoint, _secondPoint); |
|||
|
|||
_origin = new Point((_firstPoint.X + _secondPoint.X) / 2.0f, (_firstPoint.Y + _secondPoint.Y) / 2.0f); |
|||
|
|||
_actions!.Capture(_firstContact, this); |
|||
_actions!.Capture(_secondContact, this); |
|||
} |
|||
} |
|||
} |
|||
|
|||
public void PointerReleased(PointerReleasedEventArgs e) |
|||
{ |
|||
RemoveContact(e.Pointer); |
|||
} |
|||
|
|||
private void RemoveContact(IPointer pointer) |
|||
{ |
|||
if (_firstContact == pointer || _secondContact == pointer) |
|||
{ |
|||
if (_secondContact == pointer) |
|||
{ |
|||
_secondContact = null; |
|||
} |
|||
|
|||
if (_firstContact == pointer) |
|||
{ |
|||
_firstContact = _secondContact; |
|||
|
|||
_secondContact = null; |
|||
} |
|||
_target?.RaiseEvent(new PinchEndedEventArgs()); |
|||
} |
|||
} |
|||
|
|||
private float GetDistance(Point a, Point b) |
|||
{ |
|||
var length = _secondPoint - _firstPoint; |
|||
return (float)new Vector(length.X, length.Y).Length; |
|||
} |
|||
} |
|||
} |
|||
@ -0,0 +1,24 @@ |
|||
using Avalonia.Interactivity; |
|||
|
|||
namespace Avalonia.Input |
|||
{ |
|||
public class PinchEventArgs : RoutedEventArgs |
|||
{ |
|||
public PinchEventArgs(double scale, Point scaleOrigin) : base(Gestures.PinchEvent) |
|||
{ |
|||
Scale = scale; |
|||
ScaleOrigin = scaleOrigin; |
|||
} |
|||
|
|||
public double Scale { get; } = 1; |
|||
|
|||
public Point ScaleOrigin { get; } |
|||
} |
|||
|
|||
public class PinchEndedEventArgs : RoutedEventArgs |
|||
{ |
|||
public PinchEndedEventArgs() : base(Gestures.PinchEndedEvent) |
|||
{ |
|||
} |
|||
} |
|||
} |
|||
@ -0,0 +1,53 @@ |
|||
using Avalonia.Input; |
|||
using Avalonia.Interactivity; |
|||
using Avalonia.VisualTree; |
|||
|
|||
namespace Avalonia.UnitTests |
|||
{ |
|||
public class TouchTestHelper |
|||
{ |
|||
private readonly Pointer _pointer = new Pointer(Pointer.GetNextFreeId(), PointerType.Touch, true); |
|||
private ulong _nextStamp = 1; |
|||
private ulong Timestamp() => _nextStamp++; |
|||
public IInputElement Captured => _pointer.Captured; |
|||
|
|||
public void Down(Interactive target, Point position = default, KeyModifiers modifiers = default) |
|||
{ |
|||
Down(target, target, position, modifiers); |
|||
} |
|||
|
|||
public void Down(Interactive target, Interactive source, Point position = default, KeyModifiers modifiers = default) |
|||
{ |
|||
_pointer.Capture((IInputElement)target); |
|||
source.RaiseEvent(new PointerPressedEventArgs(source, _pointer, (Visual)source, position, Timestamp(), PointerPointProperties.None, |
|||
modifiers)); |
|||
} |
|||
|
|||
public void Move(Interactive target, in Point position, KeyModifiers modifiers = default) => Move(target, target, position, modifiers); |
|||
|
|||
public void Move(Interactive target, Interactive source, in Point position, KeyModifiers modifiers = default) |
|||
{ |
|||
target.RaiseEvent(new PointerEventArgs(InputElement.PointerMovedEvent, source, _pointer, (Visual)target, position, |
|||
Timestamp(), PointerPointProperties.None, modifiers)); |
|||
} |
|||
|
|||
public void Up(Interactive target, Point position = default, KeyModifiers modifiers = default) |
|||
=> Up(target, target, position, modifiers); |
|||
|
|||
public void Up(Interactive target, Interactive source, Point position = default, KeyModifiers modifiers = default) |
|||
{ |
|||
source.RaiseEvent(new PointerReleasedEventArgs(source, _pointer, (Visual)target, position, Timestamp(), PointerPointProperties.None, |
|||
modifiers, MouseButton.None)); |
|||
_pointer.Capture(null); |
|||
} |
|||
|
|||
public void Tap(Interactive target, Point position = default, KeyModifiers modifiers = default) |
|||
=> Tap(target, target, position, modifiers); |
|||
|
|||
public void Tap(Interactive target, Interactive source, Point position = default, KeyModifiers modifiers = default) |
|||
{ |
|||
Down(target, source, position, modifiers); |
|||
Up(target, source, position, modifiers); |
|||
} |
|||
} |
|||
} |
|||
Loading…
Reference in new issue