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

Revert to default ListBox mouse event handling

Browse source
This commit is contained in:
ClemensFischer 2025-03-13 19:34:07 +01:00
parent 584dcd7bb4
commit 70fd58d418
4 changed files with 18 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10,20 +10,17 @@
(item, oldValue, newValue) => item.UpdateMapTransform(newValue)); (item, oldValue, newValue) => item.UpdateMapTransform(newValue));
/// <summary> /// <summary>
/// Replaces ListBoxItem pointer event handling by not calling base.OnPointerPressed. /// Prevent range selection by Shift+PointerPressed.
/// Setting e.Handled = true generates a PointerReleased event in the parent MapItemsControl,
/// which resembles the behavior of the ListBox base class.
/// </summary> /// </summary>
protected override void OnPointerPressed(PointerPressedEventArgs e) protected override void OnPointerPressed(PointerPressedEventArgs e)
{ {
if (!e.Handled) if (e.KeyModifiers.HasFlag(KeyModifiers.Shift))
{ {
e.Handled = true; e.Handled = true;
if (ItemsControl.ItemsControlFromItemContainer(this) is MapItemsControl mapItemsControl)
{
mapItemsControl.OnItemClicked(this, e.KeyModifiers.HasFlag(KeyModifiers.Control));
} }
else
{
base.OnPointerPressed(e);
} }
} }
} }

36
MapControl/Shared/MapItemsControl.cs
View file

@ -78,41 +78,5 @@ namespace MapControl
{ {
SelectItemsByPosition(rect.Contains); SelectItemsByPosition(rect.Contains);
} }
protected internal void OnItemClicked(MapItem mapItem, bool controlKeyPressed)
{
var item = ItemFromContainer(mapItem);
if (SelectionMode == SelectionMode.Single)
{
if (SelectedItem != item)
{
SelectedItem = item;
}
else if (controlKeyPressed)
{
SelectedItem = null;
}
}
else if (
#if !AVALONIA
SelectionMode == SelectionMode.Multiple ||
#endif
controlKeyPressed)
{
if (SelectedItems.Contains(item))
{
SelectedItems.Remove(item);
}
else
{
SelectedItems.Add(item);
}
}
else
{
ResetSelectedItems(item);
}
}
} }
} }

24
MapControl/WPF/MapItem.WPF.cs
View file

@ -1,5 +1,4 @@
using System.Windows; using System.Windows;
using System.Windows.Controls;
using System.Windows.Input; using System.Windows.Input;
namespace MapControl namespace MapControl
@ -19,31 +18,18 @@ namespace MapControl
} }
/// <summary> /// <summary>
/// Replaces ListBoxItem mouse event handling by not calling base.OnMouseLeftButtonDown. /// Prevent range selection by Shift+MouseLeftButtonDown.
/// Setting e.Handled = true generates a MouseLeftButtonUp event in the parent MapItemsControl,
/// which resembles the behavior of the ListBox base class.
/// </summary> /// </summary>
protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e) protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
{ {
if (!e.Handled) if (Keyboard.Modifiers.HasFlag(ModifierKeys.Shift))
{ {
e.Handled = true; e.Handled = true;
}
if (ItemsControl.ItemsControlFromItemContainer(this) is MapItemsControl mapItemsControl) else
{ {
mapItemsControl.OnItemClicked(this, Keyboard.Modifiers.HasFlag(ModifierKeys.Control)); base.OnMouseLeftButtonDown(e);
} }
} }
} }
/// <summary>
/// Replaces ListBoxItem mouse event handling by not calling base.OnMouseRightButtonDown.
/// Setting e.Handled = true generates a MouseRightButtonUp event in the parent MapItemsControl,
/// which resembles the behavior of the ListBox base class.
/// </summary>
protected override void OnMouseRightButtonDown(MouseButtonEventArgs e)
{
OnMouseLeftButtonDown(e);
}
}
} }

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

@ -1,12 +1,10 @@
using Windows.System; using Windows.System;
#if UWP #if UWP
using Windows.UI.Xaml; using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Data; using Windows.UI.Xaml.Data;
using Windows.UI.Xaml.Input; using Windows.UI.Xaml.Input;
#else #else
using Microsoft.UI.Xaml; using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Data; using Microsoft.UI.Xaml.Data;
using Microsoft.UI.Xaml.Input; using Microsoft.UI.Xaml.Input;
#endif #endif
@ -34,21 +32,17 @@ namespace MapControl
} }
/// <summary> /// <summary>
/// Replaces ListBoxItem pointer event handling by not calling base.OnPointerPressed. /// Prevent range selection by Shift+PointerPressed.
/// Setting e.Handled = true generates a PointerReleased event in the parent MapItemsControl,
/// which differs from the behavior of the ListBox base class, where neither a PointerPressed
/// nor a PointerReleased is generated.
/// </summary> /// </summary>
protected override void OnPointerPressed(PointerRoutedEventArgs e) protected override void OnPointerPressed(PointerRoutedEventArgs e)
{ {
if (!e.Handled) if (e.KeyModifiers.HasFlag(VirtualKeyModifiers.Shift))
{ {
e.Handled = true; e.Handled = true;
if (ItemsControl.ItemsControlFromItemContainer(this) is MapItemsControl mapItemsControl)
{
mapItemsControl.OnItemClicked(this, e.KeyModifiers.HasFlag(VirtualKeyModifiers.Control));
} }
else
{
base.OnPointerPressed(e);
} }
} }