mirror of
https://github.com/ClemensFischer/XAML-Map-Control.git
synced 2026-04-07 23:45:05 +00:00
Move Execute method to base class
This commit is contained in:
parent
a1b10b6e08
commit
45ab678d5b
6 changed files with 43 additions and 29 deletions
|
|
@ -35,10 +35,8 @@ namespace MapControl.UiTools
|
|||
{
|
||||
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>())
|
||||
{
|
||||
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());
|
||||
IsChecked = true;
|
||||
var layer = MapLayer ?? (MapLayer = await MapLayerFactory.Invoke());
|
||||
|
||||
if (layer == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
map.MapLayer = layer;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
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());
|
||||
|
||||
if (layer == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (map.Children.Contains(layer))
|
||||
{
|
||||
map.Children.Remove(layer);
|
||||
|
|
@ -85,6 +95,8 @@ namespace MapControl.UiTools
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue