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

Input event handling in WinUI Map and MapItem.

Browse source
This commit is contained in:
ClemensFischer 2025-03-19 15:27:27 +01:00
parent 4cfaff7ba8
commit 86f307359f
7 changed files with 18 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
MBTiles/WinUI/MBTiles.WinUI.csproj
View file

@ -21,7 +21,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.250228001" /> <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.7.250310001" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" /> <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.119" /> <PackageReference Include="System.Data.SQLite.Core" Version="1.0.119" />
</ItemGroup> </ItemGroup>

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

@ -21,7 +21,7 @@ namespace MapControl
DependencyPropertyHelper.Register<Map, double>(nameof(MouseWheelZoomDelta), 0.25); DependencyPropertyHelper.Register<Map, double>(nameof(MouseWheelZoomDelta), 0.25);
private double mouseWheelDelta; private double mouseWheelDelta;
private bool? manipulationEnabled; private bool manipulationEnabled;
public Map() public Map()
{ {
@ -34,7 +34,6 @@ namespace MapControl
ManipulationDelta += OnManipulationDelta; ManipulationDelta += OnManipulationDelta;
ManipulationCompleted += OnManipulationCompleted; ManipulationCompleted += OnManipulationCompleted;
PointerPressed += OnPointerPressed; PointerPressed += OnPointerPressed;
PointerMoved += OnPointerMoved;
PointerWheelChanged += OnPointerWheelChanged; PointerWheelChanged += OnPointerWheelChanged;
} }
@ -50,7 +49,7 @@ namespace MapControl
private void OnManipulationDelta(object sender, ManipulationDeltaRoutedEventArgs e) private void OnManipulationDelta(object sender, ManipulationDeltaRoutedEventArgs e)
{ {
if (manipulationEnabled.HasValue && manipulationEnabled.Value) if (manipulationEnabled)
{ {
if (e.PointerDeviceType == PointerDeviceType.Mouse) if (e.PointerDeviceType == PointerDeviceType.Mouse)
{ {
@ -65,7 +64,7 @@ namespace MapControl
private void OnManipulationCompleted(object sender, ManipulationCompletedRoutedEventArgs e) private void OnManipulationCompleted(object sender, ManipulationCompletedRoutedEventArgs e)
{ {
manipulationEnabled = null; manipulationEnabled = false;
} }
private void OnPointerPressed(object sender, PointerRoutedEventArgs e) private void OnPointerPressed(object sender, PointerRoutedEventArgs e)
@ -77,17 +76,6 @@ namespace MapControl
e.KeyModifiers == VirtualKeyModifiers.None; e.KeyModifiers == VirtualKeyModifiers.None;
} }
private void OnPointerMoved(object sender, PointerRoutedEventArgs e)
{
// Set manipulationEnabled when no PointerPressed was received.
//
if (!manipulationEnabled.HasValue &&
e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
{
manipulationEnabled = e.KeyModifiers == VirtualKeyModifiers.None;
}
}
private void OnPointerWheelChanged(object sender, PointerRoutedEventArgs e) private void OnPointerWheelChanged(object sender, PointerRoutedEventArgs e)
{ {
if (e.Pointer.PointerDeviceType == PointerDeviceType.Mouse) if (e.Pointer.PointerDeviceType == PointerDeviceType.Mouse)

3
MapControl/WinUI/MapControl.WinUI.csproj
View file

@ -22,8 +22,7 @@
<ItemGroup> <ItemGroup>
<!-- Directly referencing "Microsoft.Web.WebView2 is a workaround for a bug in WindowsAppSDK, https://github.com/microsoft/WindowsAppSDK/issues/4807 --> <!-- Directly referencing "Microsoft.Web.WebView2 is a workaround for a bug in WindowsAppSDK, https://github.com/microsoft/WindowsAppSDK/issues/4807 -->
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3124.44" /> <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.7.250310001" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.250228001" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" /> <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.3" /> <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.3" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.3" /> <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.3" />

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

@ -42,8 +42,14 @@ namespace MapControl
protected override void OnPointerPressed(PointerRoutedEventArgs e) protected override void OnPointerPressed(PointerRoutedEventArgs e)
{ {
base.OnPointerPressed(e);
pointerPressedPosition = e.GetCurrentPoint(null).Position; pointerPressedPosition = e.GetCurrentPoint(null).Position;
base.OnPointerPressed(e);
// Unsetting e.Handled enables PointerPressed event handlers
// and PointerPressed handling in class Map.
//
e.Handled = false;
} }
protected override void OnPointerReleased(PointerRoutedEventArgs e) protected override void OnPointerReleased(PointerRoutedEventArgs e)
@ -65,7 +71,9 @@ namespace MapControl
} }
} }
e.Handled = true; // Unsetting e.Handled enables PointerReleased event handlers.
//
e.Handled = false;
} }
protected override void OnApplyTemplate() protected override void OnApplyTemplate()

2
MapProjections/WinUI/MapProjections.WinUI.csproj
View file

@ -21,7 +21,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.250228001" /> <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.7.250310001" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" /> <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
<PackageReference Include="ProjNET4GeoAPI" Version="1.4.1" /> <PackageReference Include="ProjNET4GeoAPI" Version="1.4.1" />
</ItemGroup> </ItemGroup>

2
MapUiTools/WinUI/MapUiTools.WinUI.csproj
View file

@ -17,7 +17,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.250228001" /> <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.7.250310001" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" /> <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
SampleApps/WinUiApp/WinUiApp.csproj
View file

@ -36,7 +36,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.250228001" /> <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.7.250310001" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" /> <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
<Manifest Include="$(ApplicationManifest)" /> <Manifest Include="$(ApplicationManifest)" />
</ItemGroup> </ItemGroup>