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

Avalonia 12

Browse source
This commit is contained in:
ClemensFischer 2026-04-10 16:55:33 +02:00
parent db9abd228d
commit cf6131f59e
13 changed files with 89 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MapControl/Avalonia/MapControl.Avalonia.csproj
View file

@ -16,7 +16,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="11.3.13" />
<PackageReference Include="Avalonia" Version="12.0.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="10.0.5" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.5" />
</ItemGroup>

4
MapControl/Avalonia/MapItem.Avalonia.cs
View file

@ -10,7 +10,7 @@ namespace MapControl
if (e.Pointer.Type != PointerType.Mouse &&
ItemsControl.ItemsControlFromItemContainer(this) is MapItemsControl mapItemsControl)
{
mapItemsControl.UpdateSelection(this, e);
mapItemsControl.UpdateSelectionFromEvent(this, e);
}
e.Handled = true;
@ -22,7 +22,7 @@ namespace MapControl
e.InitialPressMouseButton == MouseButton.Left &&
ItemsControl.ItemsControlFromItemContainer(this) is MapItemsControl mapItemsControl)
{
mapItemsControl.UpdateSelection(this, e);
mapItemsControl.UpdateSelectionFromEvent(this, e);
}
e.Handled = true;

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

@ -1,7 +1,9 @@
using Avalonia.Controls;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Controls.Presenters;
using Avalonia.Controls.Templates;
using Avalonia.Input;
using Avalonia.Interactivity;
using Avalonia.Media;
namespace MapControl
@ -52,17 +54,22 @@ namespace MapControl
ClearContainer((MapItem)container);
}
internal void UpdateSelection(MapItem mapItem, PointerEventArgs e)
protected override bool ShouldTriggerSelection(Visual selectable, PointerEventArgs eventArgs)
{
if (SelectionMode != SelectionMode.Single &&
return true;
}
public override bool UpdateSelectionFromEvent(UIElement container, RoutedEventArgs eventArgs)
{
if (SelectionMode == SelectionMode.Multiple &&
eventArgs is PointerEventArgs e &&
e.KeyModifiers.HasFlag(KeyModifiers.Shift))
{
SelectItemsInRange(mapItem);
}
else
{
UpdateSelection(mapItem, true, false, e.KeyModifiers.HasFlag(KeyModifiers.Control));
SelectItemsInRange((MapItem)container);
return true;
}
return base.UpdateSelectionFromEvent(container, eventArgs);
}
}
}