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

Move Execute method to base class

Browse source
This commit is contained in:
ClemensFischer 2025-03-21 18:03:57 +01:00
parent a1b10b6e08
commit 45ab678d5b
6 changed files with 43 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
MapUiTools/Avalonia/MapMenuItem.Avalonia.cs
View file

@ -4,10 +4,11 @@ using Avalonia.Media;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks;
namespace MapControl.UiTools namespace MapControl.UiTools
{ {
public class MapMenuItem : MenuItem public abstract class MapMenuItem : MenuItem
{ {
public MapMenuItem() public MapMenuItem()
{ {
@ -25,7 +26,9 @@ namespace MapControl.UiTools
set => Header = value; set => Header = value;
} }
protected IEnumerable<MapMenuItem> ParentMenuItems => (Parent as ItemsControl)?.Items.OfType<MapMenuItem>(); public abstract Task<bool> Execute(MapBase map);
protected IEnumerable<MapMenuItem> ParentMenuItems => ((ItemsControl)Parent).Items.OfType<MapMenuItem>();
protected override Type StyleKeyOverride => typeof(MenuItem); protected override Type StyleKeyOverride => typeof(MenuItem);

26
MapUiTools/Shared/MapLayerMenuItem.cs
View file

@ -35,10 +35,8 @@ namespace MapControl.UiTools
{ {
Click += async (s, e) => Click += async (s, e) =>
{ {
if (DataContext is MapBase map) if (DataContext is MapBase map && await Execute(map))
{ {
await Execute(map);
foreach (var item in ParentMenuItems.OfType<MapLayerMenuItem>()) foreach (var item in ParentMenuItems.OfType<MapLayerMenuItem>())
{ {
item.IsChecked = map.Children.Contains(item.MapLayer); item.IsChecked = map.Children.Contains(item.MapLayer);
@ -47,19 +45,31 @@ namespace MapControl.UiTools
}; };
} }
public virtual async Task Execute(MapBase map) public override async Task<bool> Execute(MapBase map)
{ {
map.MapLayer = MapLayer ?? (MapLayer = await MapLayerFactory.Invoke()); var layer = MapLayer ?? (MapLayer = await MapLayerFactory.Invoke());
IsChecked = true;
if (layer == null)
{
return false;
}
map.MapLayer = layer;
return true;
} }
} }
public class MapOverlayMenuItem : MapLayerMenuItem public class MapOverlayMenuItem : MapLayerMenuItem
{ {
public override async Task Execute(MapBase map) public override async Task<bool> Execute(MapBase map)
{ {
var layer = MapLayer ?? (MapLayer = await MapLayerFactory.Invoke()); var layer = MapLayer ?? (MapLayer = await MapLayerFactory.Invoke());
if (layer == null)
{
return false;
}
if (map.Children.Contains(layer)) if (map.Children.Contains(layer))
{ {
map.Children.Remove(layer); map.Children.Remove(layer);
@ -85,6 +95,8 @@ namespace MapControl.UiTools
} }
} }
} }
return true;
} }
} }
} }

11
MapUiTools/Shared/MapProjectionMenuItem.cs
View file

@ -1,6 +1,7 @@
using System; using System;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Threading.Tasks;
#if WPF #if WPF
using System.Windows.Markup; using System.Windows.Markup;
#elif UWP #elif UWP
@ -27,12 +28,10 @@ namespace MapControl.UiTools
public MapProjectionMenuItem() public MapProjectionMenuItem()
{ {
Click += (s, e) => Click += async (s, e) =>
{ {
if (DataContext is MapBase map) if (DataContext is MapBase map && await Execute(map))
{ {
Execute(map);
foreach (var item in ParentMenuItems.OfType<MapProjectionMenuItem>()) foreach (var item in ParentMenuItems.OfType<MapProjectionMenuItem>())
{ {
item.IsChecked = map.MapProjection.CrsId == item.MapProjection; item.IsChecked = map.MapProjection.CrsId == item.MapProjection;
@ -41,7 +40,7 @@ namespace MapControl.UiTools
}; };
} }
public void Execute(MapBase map) public override Task<bool> Execute(MapBase map)
{ {
bool success = true; bool success = true;
@ -58,7 +57,7 @@ namespace MapControl.UiTools
} }
} }
IsChecked = success; return Task.FromResult(success);
} }
} }
} }

13
MapUiTools/Shared/MenuButton.cs
View file

@ -33,16 +33,11 @@ namespace MapControl.UiTools
{ {
DataContext = Map; DataContext = Map;
if (Items.Count > 0) if (Items.Count > 0 &&
Items[0] is MapMenuItem item &&
await item.Execute(Map))
{ {
if (Items[0] is MapLayerMenuItem mapLayerItem) item.IsChecked = true;
{
await mapLayerItem.Execute(Map);
}
else if (Items[0] is MapProjectionMenuItem mapProjectionItem)
{
mapProjectionItem.Execute(Map);
}
} }
} }
} }

8
MapUiTools/WPF/MapMenuItem.WPF.cs
View file

@ -1,10 +1,11 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks;
using System.Windows.Controls; using System.Windows.Controls;
namespace MapControl.UiTools namespace MapControl.UiTools
{ {
public class MapMenuItem : MenuItem public abstract class MapMenuItem : MenuItem
{ {
public string Text public string Text
{ {
@ -12,7 +13,8 @@ namespace MapControl.UiTools
set => Header = value; set => Header = value;
} }
protected IEnumerable<MapMenuItem> ParentMenuItems public abstract Task<bool> Execute(MapBase map);
=> (Parent as ItemsControl)?.Items.OfType<MapMenuItem>();
protected IEnumerable<MapMenuItem> ParentMenuItems => ((ItemsControl)Parent).Items.OfType<MapMenuItem>();
} }
} }

7
MapUiTools/WinUI/MapMenuItem.WinUI.cs
View file

@ -1,5 +1,6 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks;
#if UWP #if UWP
using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Media; using Windows.UI.Xaml.Media;
@ -10,9 +11,11 @@ using Microsoft.UI.Xaml.Media;
namespace MapControl.UiTools namespace MapControl.UiTools
{ {
public class MapMenuItem : ToggleMenuFlyoutItem public abstract class MapMenuItem : ToggleMenuFlyoutItem
{ {
public abstract Task<bool> Execute(MapBase map);
protected IEnumerable<MapMenuItem> ParentMenuItems protected IEnumerable<MapMenuItem> ParentMenuItems
=> (VisualTreeHelper.GetParent(this) as Panel)?.Children.OfType<MapMenuItem>(); => ((Panel)VisualTreeHelper.GetParent(this)).Children.OfType<MapMenuItem>();
} }
} }