mirror of
https://github.com/ClemensFischer/XAML-Map-Control.git
synced 2025-12-06 07:12:04 +01:00
Move event handlers to base class
This commit is contained in:
parent
a9c1a4c320
commit
5680c9c25f
|
|
@ -8,9 +8,9 @@ using System.Threading.Tasks;
|
|||
|
||||
namespace MapControl.UiTools
|
||||
{
|
||||
public abstract class MapMenuItem : MenuItem
|
||||
public abstract partial class MapMenuItem : MenuItem
|
||||
{
|
||||
public MapMenuItem()
|
||||
protected MapMenuItem()
|
||||
{
|
||||
Icon = new TextBlock
|
||||
{
|
||||
|
|
@ -18,6 +18,27 @@ namespace MapControl.UiTools
|
|||
FontWeight = FontWeight.Black,
|
||||
VerticalAlignment = Avalonia.Layout.VerticalAlignment.Center,
|
||||
};
|
||||
|
||||
Loaded += (s, e) =>
|
||||
{
|
||||
if (DataContext is MapBase map)
|
||||
{
|
||||
IsChecked = GetIsChecked(map);
|
||||
}
|
||||
};
|
||||
|
||||
Click += async (s, e) =>
|
||||
{
|
||||
if (DataContext is MapBase map)
|
||||
{
|
||||
await Execute(map);
|
||||
|
||||
foreach (var item in ParentMenuItems)
|
||||
{
|
||||
item.IsChecked = item.GetIsChecked(map);
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
public string Text
|
||||
|
|
@ -26,12 +47,14 @@ namespace MapControl.UiTools
|
|||
set => Header = value;
|
||||
}
|
||||
|
||||
public abstract Task Execute(MapBase map);
|
||||
|
||||
protected IEnumerable<MapMenuItem> ParentMenuItems => ((ItemsControl)Parent).Items.OfType<MapMenuItem>();
|
||||
|
||||
protected override Type StyleKeyOverride => typeof(MenuItem);
|
||||
|
||||
protected abstract bool GetIsChecked(MapBase map);
|
||||
|
||||
public abstract Task Execute(MapBase map);
|
||||
|
||||
protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs args)
|
||||
{
|
||||
base.OnPropertyChanged(args);
|
||||
|
|
|
|||
|
|
@ -31,28 +31,9 @@ namespace MapControl.UiTools
|
|||
|
||||
public Func<Task<FrameworkElement>> MapLayerFactory { get; set; }
|
||||
|
||||
public MapLayerMenuItem()
|
||||
protected override bool GetIsChecked(MapBase map)
|
||||
{
|
||||
Loaded += (s, e) =>
|
||||
{
|
||||
if (DataContext is MapBase map)
|
||||
{
|
||||
IsChecked = map.Children.Contains(MapLayer);
|
||||
}
|
||||
};
|
||||
|
||||
Click += async (s, e) =>
|
||||
{
|
||||
if (DataContext is MapBase map)
|
||||
{
|
||||
await Execute(map);
|
||||
|
||||
foreach (var item in ParentMenuItems.OfType<MapLayerMenuItem>())
|
||||
{
|
||||
item.IsChecked = map.Children.Contains(item.MapLayer);
|
||||
}
|
||||
}
|
||||
};
|
||||
return map.Children.Contains(MapLayer);
|
||||
}
|
||||
|
||||
public override async Task Execute(MapBase map)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
using System;
|
||||
using System.Diagnostics;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
#if WPF
|
||||
using System.Windows.Markup;
|
||||
|
|
@ -26,28 +25,9 @@ namespace MapControl.UiTools
|
|||
#endif
|
||||
public string MapProjection { get; set; }
|
||||
|
||||
public MapProjectionMenuItem()
|
||||
protected override bool GetIsChecked(MapBase map)
|
||||
{
|
||||
Loaded += (s, e) =>
|
||||
{
|
||||
if (DataContext is MapBase map)
|
||||
{
|
||||
IsChecked = map.MapProjection.CrsId == MapProjection;
|
||||
}
|
||||
};
|
||||
|
||||
Click += async (s, e) =>
|
||||
{
|
||||
if (DataContext is MapBase map)
|
||||
{
|
||||
await Execute(map);
|
||||
|
||||
foreach (var item in ParentMenuItems.OfType<MapProjectionMenuItem>())
|
||||
{
|
||||
item.IsChecked = map.MapProjection.CrsId == item.MapProjection;
|
||||
}
|
||||
}
|
||||
};
|
||||
return map.MapProjection.CrsId == MapProjection;
|
||||
}
|
||||
|
||||
public override Task Execute(MapBase map)
|
||||
|
|
|
|||
|
|
@ -7,14 +7,40 @@ namespace MapControl.UiTools
|
|||
{
|
||||
public abstract class MapMenuItem : MenuItem
|
||||
{
|
||||
protected MapMenuItem()
|
||||
{
|
||||
Loaded += (s, e) =>
|
||||
{
|
||||
if (DataContext is MapBase map)
|
||||
{
|
||||
IsChecked = GetIsChecked(map);
|
||||
}
|
||||
};
|
||||
|
||||
Click += async (s, e) =>
|
||||
{
|
||||
if (DataContext is MapBase map)
|
||||
{
|
||||
await Execute(map);
|
||||
|
||||
foreach (var item in ParentMenuItems)
|
||||
{
|
||||
item.IsChecked = item.GetIsChecked(map);
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
public string Text
|
||||
{
|
||||
get => Header as string;
|
||||
set => Header = value;
|
||||
}
|
||||
|
||||
public abstract Task Execute(MapBase map);
|
||||
|
||||
protected IEnumerable<MapMenuItem> ParentMenuItems => ((ItemsControl)Parent).Items.OfType<MapMenuItem>();
|
||||
|
||||
protected abstract bool GetIsChecked(MapBase map);
|
||||
|
||||
public abstract Task Execute(MapBase map);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,11 +15,34 @@ namespace MapControl.UiTools
|
|||
{
|
||||
protected MapMenuItem()
|
||||
{
|
||||
Loaded += (s, e) => ParentMenuItems = ((Panel)VisualTreeHelper.GetParent(this)).Children.OfType<MapMenuItem>().ToList();
|
||||
Loaded += (s, e) =>
|
||||
{
|
||||
ParentMenuItems = ((Panel)VisualTreeHelper.GetParent(this)).Children.OfType<MapMenuItem>().ToList();
|
||||
|
||||
if (DataContext is MapBase map)
|
||||
{
|
||||
IsChecked = GetIsChecked(map);
|
||||
}
|
||||
};
|
||||
|
||||
Click += async (s, e) =>
|
||||
{
|
||||
if (DataContext is MapBase map)
|
||||
{
|
||||
await Execute(map);
|
||||
|
||||
foreach (var item in ParentMenuItems)
|
||||
{
|
||||
item.IsChecked = item.GetIsChecked(map);
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
public abstract Task Execute(MapBase map);
|
||||
|
||||
protected IList<MapMenuItem> ParentMenuItems { get; private set; }
|
||||
|
||||
protected abstract bool GetIsChecked(MapBase map);
|
||||
|
||||
public abstract Task Execute(MapBase map);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue