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 event handlers to base class

Browse source
This commit is contained in:
ClemensFischer 2025-03-26 19:58:47 +01:00
parent a9c1a4c320
commit 5680c9c25f
5 changed files with 85 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8,9 +8,9 @@ using System.Threading.Tasks;
namespace MapControl.UiTools namespace MapControl.UiTools
{ {
public abstract class MapMenuItem : MenuItem public abstract partial class MapMenuItem : MenuItem
{ {
public MapMenuItem() protected MapMenuItem()
{ {
Icon = new TextBlock Icon = new TextBlock
{ {
@ -18,6 +18,27 @@ namespace MapControl.UiTools
FontWeight = FontWeight.Black, FontWeight = FontWeight.Black,
VerticalAlignment = Avalonia.Layout.VerticalAlignment.Center, 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 public string Text
@ -26,12 +47,14 @@ namespace MapControl.UiTools
set => Header = value; set => Header = value;
} }
public abstract Task Execute(MapBase map);
protected IEnumerable<MapMenuItem> ParentMenuItems => ((ItemsControl)Parent).Items.OfType<MapMenuItem>(); protected IEnumerable<MapMenuItem> ParentMenuItems => ((ItemsControl)Parent).Items.OfType<MapMenuItem>();
protected override Type StyleKeyOverride => typeof(MenuItem); protected override Type StyleKeyOverride => typeof(MenuItem);
protected abstract bool GetIsChecked(MapBase map);
public abstract Task Execute(MapBase map);
protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs args) protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs args)
{ {
base.OnPropertyChanged(args); base.OnPropertyChanged(args);

23
MapUiTools/Shared/MapLayerMenuItem.cs
View file

@ -31,28 +31,9 @@ namespace MapControl.UiTools
public Func<Task<FrameworkElement>> MapLayerFactory { get; set; } public Func<Task<FrameworkElement>> MapLayerFactory { get; set; }
public MapLayerMenuItem() protected override bool GetIsChecked(MapBase map)
{ {
Loaded += (s, e) => return map.Children.Contains(MapLayer);
{
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);
}
}
};
} }
public override async Task Execute(MapBase map) public override async Task Execute(MapBase map)

24
MapUiTools/Shared/MapProjectionMenuItem.cs
View file

@ -1,6 +1,5 @@
using System; using System;
using System.Diagnostics; using System.Diagnostics;
using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
#if WPF #if WPF
using System.Windows.Markup; using System.Windows.Markup;
@ -26,28 +25,9 @@ namespace MapControl.UiTools
#endif #endif
public string MapProjection { get; set; } public string MapProjection { get; set; }
public MapProjectionMenuItem() protected override bool GetIsChecked(MapBase map)
{ {
Loaded += (s, e) => return map.MapProjection.CrsId == MapProjection;
{
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;
}
}
};
} }
public override Task Execute(MapBase map) public override Task Execute(MapBase map)

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

@ -7,14 +7,40 @@ namespace MapControl.UiTools
{ {
public abstract class MapMenuItem : MenuItem 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 public string Text
{ {
get => Header as string; get => Header as string;
set => Header = value; set => Header = value;
} }
public abstract Task Execute(MapBase map);
protected IEnumerable<MapMenuItem> ParentMenuItems => ((ItemsControl)Parent).Items.OfType<MapMenuItem>(); protected IEnumerable<MapMenuItem> ParentMenuItems => ((ItemsControl)Parent).Items.OfType<MapMenuItem>();
protected abstract bool GetIsChecked(MapBase map);
public abstract Task Execute(MapBase map);
} }
} }

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

@ -15,11 +15,34 @@ namespace MapControl.UiTools
{ {
protected MapMenuItem() 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();
public abstract Task Execute(MapBase map); 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);
}
}
};
}
protected IList<MapMenuItem> ParentMenuItems { get; private set; } protected IList<MapMenuItem> ParentMenuItems { get; private set; }
protected abstract bool GetIsChecked(MapBase map);
public abstract Task Execute(MapBase map);
} }
} }