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

Unified WinUI and Avalonia MapItem selection

Browse source
This commit is contained in:
ClemensFischer 2026-04-14 11:52:32 +02:00
parent 3c28b9043b
commit 3d5a52113a
4 changed files with 66 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MapControl/Avalonia/Map.Avalonia.cs
View file

@ -67,8 +67,6 @@ public partial class Map
point.Pointer.Type == PointerType.Touch &&
ManipulationMode != ManipulationModes.None)
{
point.Pointer.Capture(this);
if (pointer1 == null)
{
pointer1 = point.Pointer;

45
MapControl/Avalonia/MapItem.Avalonia.cs Normal file
View file

@ -0,0 +1,45 @@
using Avalonia;
using Avalonia.Input;
using System;
namespace MapControl;
public partial class MapItem
{
Point? pointerPressedPosition;
protected override void OnPointerPressed(PointerPressedEventArgs e)
{
base.OnPointerPressed(e);
var point = e.GetCurrentPoint(null);
if (point.Properties.IsLeftButtonPressed)
{
pointerPressedPosition = point.Position;
}
e.Handled = true;
}
protected override void OnPointerReleased(PointerReleasedEventArgs e)
{
if (pointerPressedPosition.HasValue)
{
const double pointerMovementThreshold = 2d;
var position = e.GetCurrentPoint(null).Position;
// Perform selection only when no significant pointer movement occured.
//
if (Math.Abs(position.X - pointerPressedPosition.Value.X) <= pointerMovementThreshold &&
Math.Abs(position.Y - pointerPressedPosition.Value.Y) <= pointerMovementThreshold)
{
base.OnPointerReleased(e);
}
pointerPressedPosition = null;
}
e.Handled = true;
}
}

14
MapControl/Avalonia/MapItemsControl.Avalonia.cs
View file

@ -54,22 +54,22 @@ public partial class MapItemsControl
ClearContainer((MapItem)container);
}
protected override bool ShouldTriggerSelection(Visual selectable, PointerEventArgs eventArgs)
protected override bool ShouldTriggerSelection(Visual selectable, PointerEventArgs e)
{
return eventArgs.Pointer.Type != PointerType.Mouse ||
eventArgs.Properties.PointerUpdateKind == PointerUpdateKind.LeftButtonReleased;
return e.Properties.PointerUpdateKind == PointerUpdateKind.LeftButtonReleased;
}
public override bool UpdateSelectionFromEvent(UIElement container, RoutedEventArgs eventArgs)
public override bool UpdateSelectionFromEvent(UIElement container, RoutedEventArgs e)
{
if (SelectionMode == SelectionMode.Multiple &&
eventArgs is PointerEventArgs pointerEventArgs &&
pointerEventArgs.KeyModifiers.HasFlag(KeyModifiers.Shift))
e is PointerEventArgs p &&
p.KeyModifiers.HasFlag(KeyModifiers.Shift) &&
ShouldTriggerSelection(container, p))
{
SelectItemsInRange((MapItem)container);
return true;
}
return base.UpdateSelectionFromEvent(container, eventArgs);
return base.UpdateSelectionFromEvent(container, e);
}
}

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

@ -27,7 +27,14 @@ public partial class MapItem
protected override void OnPointerPressed(PointerRoutedEventArgs e)
{
base.OnPointerPressed(e);
pointerPressedPosition = e.GetCurrentPoint(null).Position;
var point = e.GetCurrentPoint(null);
if (point.Properties.IsLeftButtonPressed)
{
pointerPressedPosition = point.Position;
}
e.Handled = true;
}
@ -35,16 +42,16 @@ public partial class MapItem
{
if (pointerPressedPosition.HasValue)
{
const float pointerMovementThreshold = 2f;
var p = e.GetCurrentPoint(null).Position;
const double pointerMovementThreshold = 2d;
var position = 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)
if (Math.Abs(position.X - pointerPressedPosition.Value.X) <= pointerMovementThreshold &&
Math.Abs(position.Y - pointerPressedPosition.Value.Y) <= pointerMovementThreshold)
{
if (mapItemsControl.SelectionMode == SelectionMode.Extended &&
if (ItemsControl.ItemsControlFromItemContainer(this) is MapItemsControl mapItemsControl &&
mapItemsControl.SelectionMode == SelectionMode.Extended &&
e.KeyModifiers.HasFlag(VirtualKeyModifiers.Shift))
{
mapItemsControl.SelectItemsInRange(this);