ClemensFischer/XAML-Map-Control
1
0
Fork 0
mirror of https://github.com/ClemensFischer/XAML-Map-Control.git synced 2025-12-06 07:12:04 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update MapItem.WinUI.cs

Browse source
This commit is contained in:
ClemensFischer 2025-03-19 20:25:45 +01:00
parent c510e32014
commit 946d28a50c
1 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
MapControl/WinUI/MapItem.WinUI.cs
View file

@ -28,10 +28,6 @@ namespace MapControl
item.UpdateMapTransform(newValue); item.UpdateMapTransform(newValue);
}); });
// Used to detect pointer movement between PointerPressed and
// PointerReleased in order to possibly cancel item selection.
//
private const float pointerMovementThreshold = 2f;
private Windows.Foundation.Point? pointerPressedPosition; private Windows.Foundation.Point? pointerPressedPosition;
public MapItem() public MapItem()
@ -49,25 +45,31 @@ namespace MapControl
protected override void OnPointerReleased(PointerRoutedEventArgs e) protected override void OnPointerReleased(PointerRoutedEventArgs e)
{ {
var p = e.GetCurrentPoint(null).Position; if (pointerPressedPosition.HasValue)
if (pointerPressedPosition.HasValue &&
Math.Abs(p.X - pointerPressedPosition.Value.X) <= pointerMovementThreshold &&
Math.Abs(p.Y - pointerPressedPosition.Value.Y) <= pointerMovementThreshold &&
ItemsControl.ItemsControlFromItemContainer(this) is MapItemsControl mapItemsControl)
{ {
if (mapItemsControl.SelectionMode == SelectionMode.Extended && const float pointerMovementThreshold = 2f;
e.KeyModifiers.HasFlag(VirtualKeyModifiers.Shift)) var p = e.GetCurrentPoint(null).Position;
// Perform selection only when no significant pointer movement occured.
//
if (Math.Abs(p.X - pointerPressedPosition.Value.X) <= pointerMovementThreshold &&
Math.Abs(p.Y - pointerPressedPosition.Value.Y) <= pointerMovementThreshold &&
ItemsControl.ItemsControlFromItemContainer(this) is MapItemsControl mapItemsControl)
{ {
mapItemsControl.SelectItemsInRange(this); if (mapItemsControl.SelectionMode == SelectionMode.Extended &&
} e.KeyModifiers.HasFlag(VirtualKeyModifiers.Shift))
else {
{ mapItemsControl.SelectItemsInRange(this);
base.OnPointerReleased(e); }
else
{
base.OnPointerReleased(e);
}
} }
pointerPressedPosition = null;
} }
pointerPressedPosition = null;
e.Handled = true; e.Handled = true;
} }