Browse Source
Merge branch 'master' into fixes/3431-itemscontrol-bg
pull/3481/head
Jumar Macato
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
3 additions and
3 deletions
-
src/Avalonia.Input/Gestures.cs
-
tests/Avalonia.Input.UnitTests/GesturesTests.cs
|
|
@ -79,7 +79,7 @@ namespace Avalonia.Input |
|
|
{ |
|
|
{ |
|
|
s_lastPress = new WeakReference<IInteractive>(e.Source); |
|
|
s_lastPress = new WeakReference<IInteractive>(e.Source); |
|
|
} |
|
|
} |
|
|
else if (s_lastPress != null && e.ClickCount == 2 && e.MouseButton != MouseButton.Right) |
|
|
else if (s_lastPress != null && e.ClickCount == 2 && e.MouseButton == MouseButton.Left) |
|
|
{ |
|
|
{ |
|
|
if (s_lastPress.TryGetTarget(out var target) && target == e.Source) |
|
|
if (s_lastPress.TryGetTarget(out var target) && target == e.Source) |
|
|
{ |
|
|
{ |
|
|
|
|
|
@ -135,7 +135,7 @@ namespace Avalonia.Interactivity.UnitTests |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
[Fact] |
|
|
[Fact] |
|
|
public void DoubleTapped_Should_Be_Raised_For_Middle_Button() |
|
|
public void DoubleTapped_Should_Not_Be_Raised_For_Middle_Button() |
|
|
{ |
|
|
{ |
|
|
Border border = new Border(); |
|
|
Border border = new Border(); |
|
|
var decorator = new Decorator |
|
|
var decorator = new Decorator |
|
|
@ -149,7 +149,7 @@ namespace Avalonia.Interactivity.UnitTests |
|
|
_mouse.Click(border, MouseButton.Middle); |
|
|
_mouse.Click(border, MouseButton.Middle); |
|
|
_mouse.Down(border, MouseButton.Middle, clickCount: 2); |
|
|
_mouse.Down(border, MouseButton.Middle, clickCount: 2); |
|
|
|
|
|
|
|
|
Assert.True(raised); |
|
|
Assert.False(raised); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
[Fact] |
|
|
[Fact] |
|
|
|
