mirror of
https://github.com/ClemensFischer/XAML-Map-Control.git
synced 2025-12-06 07:12:04 +01:00
Update Map.Avalonia.cs
This commit is contained in:
parent
33cb30c570
commit
1788da27bd
|
|
@ -32,15 +32,15 @@ namespace MapControl
|
||||||
|
|
||||||
protected override void OnPointerWheelChanged(PointerWheelEventArgs e)
|
protected override void OnPointerWheelChanged(PointerWheelEventArgs e)
|
||||||
{
|
{
|
||||||
base.OnPointerWheelChanged(e);
|
|
||||||
|
|
||||||
ZoomMap(e.GetPosition(this), TargetZoomLevel + MouseWheelZoomDelta * e.Delta.Y);
|
ZoomMap(e.GetPosition(this), TargetZoomLevel + MouseWheelZoomDelta * e.Delta.Y);
|
||||||
|
|
||||||
|
e.Handled = true;
|
||||||
|
|
||||||
|
base.OnPointerWheelChanged(e);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void OnPointerPressed(PointerPressedEventArgs e)
|
protected override void OnPointerPressed(PointerPressedEventArgs e)
|
||||||
{
|
{
|
||||||
base.OnPointerPressed(e);
|
|
||||||
|
|
||||||
var point = e.GetCurrentPoint(this);
|
var point = e.GetCurrentPoint(this);
|
||||||
|
|
||||||
if (pointer2 == null &&
|
if (pointer2 == null &&
|
||||||
|
|
@ -58,13 +58,15 @@ namespace MapControl
|
||||||
pointer2 = point.Pointer;
|
pointer2 = point.Pointer;
|
||||||
position2 = point.Position;
|
position2 = point.Position;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
e.Handled = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
base.OnPointerPressed(e);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void OnPointerReleased(PointerReleasedEventArgs e)
|
protected override void OnPointerReleased(PointerReleasedEventArgs e)
|
||||||
{
|
{
|
||||||
base.OnPointerReleased(e);
|
|
||||||
|
|
||||||
if (e.Pointer == pointer1 || e.Pointer == pointer2)
|
if (e.Pointer == pointer1 || e.Pointer == pointer2)
|
||||||
{
|
{
|
||||||
e.Pointer.Capture(null);
|
e.Pointer.Capture(null);
|
||||||
|
|
@ -76,13 +78,15 @@ namespace MapControl
|
||||||
}
|
}
|
||||||
|
|
||||||
pointer2 = null;
|
pointer2 = null;
|
||||||
|
|
||||||
|
e.Handled = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
base.OnPointerReleased(e);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void OnPointerMoved(PointerEventArgs e)
|
protected override void OnPointerMoved(PointerEventArgs e)
|
||||||
{
|
{
|
||||||
base.OnPointerMoved(e);
|
|
||||||
|
|
||||||
if (e.Pointer == pointer1 || e.Pointer == pointer2)
|
if (e.Pointer == pointer1 || e.Pointer == pointer2)
|
||||||
{
|
{
|
||||||
var position = e.GetPosition(this);
|
var position = e.GetPosition(this);
|
||||||
|
|
@ -115,7 +119,11 @@ namespace MapControl
|
||||||
|
|
||||||
TransformMap(newOrigin, newOrigin - oldOrigin, newAngle - oldAngle, scale);
|
TransformMap(newOrigin, newOrigin - oldOrigin, newAngle - oldAngle, scale);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
e.Handled = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
base.OnPointerMoved(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue