ClemensFischer/XAML-Map-Control
1
0
Fork 0
mirror of https://github.com/ClemensFischer/XAML-Map-Control.git synced 2026-04-07 07:25:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed panning for UWP/WinUI

Browse source
This commit is contained in:
Clemens 2022-01-12 23:56:05 +01:00
parent 2ac4985c47
commit e2f4fc13b1
6 changed files with 128 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

49
MapControl/WinUI/Map.WinUI.cs
View file

@ -21,6 +21,8 @@ namespace MapControl
public static readonly DependencyProperty MouseWheelZoomDeltaProperty = DependencyProperty.Register(
nameof(MouseWheelZoomDelta), typeof(double), typeof(Map), new PropertyMetadata(1d));
private Point? mousePosition;
public Map()
{
ManipulationMode = ManipulationModes.Scale
@ -28,8 +30,11 @@ namespace MapControl
| ManipulationModes.TranslateY
| ManipulationModes.TranslateInertia;
ManipulationDelta += OnManipulationDelta;
PointerWheelChanged += OnPointerWheelChanged;
PointerPressed += OnPointerPressed;
PointerReleased += OnPointerReleased;
PointerMoved += OnPointerMoved;
ManipulationDelta += OnManipulationDelta;
}
/// <summary>
@ -42,11 +47,6 @@ namespace MapControl
set { SetValue(MouseWheelZoomDeltaProperty, value); }
}
private void OnManipulationDelta(object sender, ManipulationDeltaRoutedEventArgs e)
{
TransformMap(e.Position, e.Delta.Translation, e.Delta.Rotation, e.Delta.Scale);
}
private void OnPointerWheelChanged(object sender, PointerRoutedEventArgs e)
{
var point = e.GetCurrentPoint(this);
@ -54,5 +54,42 @@ namespace MapControl
ZoomMap(point.Position, MouseWheelZoomDelta * Math.Round(zoomLevel / MouseWheelZoomDelta));
}
private void OnPointerPressed(object sender, PointerRoutedEventArgs e)
{
if (CapturePointer(e.Pointer))
{
mousePosition = e.GetCurrentPoint(this).Position;
}
}
private void OnPointerReleased(object sender, PointerRoutedEventArgs e)
{
if (mousePosition.HasValue)
{
mousePosition = null;
ReleasePointerCaptures();
}
}
private void OnPointerMoved(object sender, PointerRoutedEventArgs e)
{
if (mousePosition.HasValue)
{
Point position = e.GetCurrentPoint(this).Position;
var translation = position - mousePosition.Value;
mousePosition = position;
TranslateMap(translation);
}
}
private void OnManipulationDelta(object sender, ManipulationDeltaRoutedEventArgs e)
{
if (!mousePosition.HasValue)
{
TransformMap(e.Position, e.Delta.Translation, e.Delta.Rotation, e.Delta.Scale);
}
}
}
}