diff --git a/src/Avalonia.Controls/NativeMenu.cs b/src/Avalonia.Controls/NativeMenu.cs index 58406a38b1..38a9f03d29 100644 --- a/src/Avalonia.Controls/NativeMenu.cs +++ b/src/Avalonia.Controls/NativeMenu.cs @@ -26,7 +26,7 @@ namespace Avalonia.Controls _items.CollectionChanged += ItemsChanged; } - void INativeMenuExporterEventsImplBridge.RaiseNeedsUpdate () + void INativeMenuExporterEventsImplBridge.RaiseNeedsUpdate() { Opening?.Invoke(this, EventArgs.Empty); } @@ -39,10 +39,10 @@ namespace Avalonia.Controls private void ItemsChanged(object sender, NotifyCollectionChangedEventArgs e) { - if(e.OldItems!=null) + if (e.OldItems != null) foreach (NativeMenuItemBase i in e.OldItems) i.Parent = null; - if(e.NewItems!=null) + if (e.NewItems != null) foreach (NativeMenuItemBase i in e.NewItems) i.Parent = this; } @@ -57,7 +57,7 @@ namespace Avalonia.Controls } public void Add(NativeMenuItemBase item) => _items.Add(item); - + public IEnumerator GetEnumerator() => _items.GetEnumerator(); IEnumerator IEnumerable.GetEnumerator() diff --git a/src/Avalonia.Controls/NativeMenuItem.cs b/src/Avalonia.Controls/NativeMenuItem.cs index af87745600..2f2eca539b 100644 --- a/src/Avalonia.Controls/NativeMenuItem.cs +++ b/src/Avalonia.Controls/NativeMenuItem.cs @@ -98,7 +98,7 @@ namespace Avalonia.Controls { get => _isChecked; set => SetAndRaise(IsCheckedProperty, ref _isChecked, value); - } + } public static readonly DirectProperty CommandProperty = Button.CommandProperty.AddOwner( @@ -138,12 +138,12 @@ namespace Avalonia.Controls nameof(ICommand.CanExecuteChanged), _canExecuteChangedSubscriber); SetAndRaise(CommandProperty, ref _command, value); - + if (_command != null) WeakSubscriptionManager.Subscribe(_command, nameof(ICommand.CanExecuteChanged), _canExecuteChangedSubscriber); - - CanExecuteChanged(); + + CanExecuteChanged(); } } diff --git a/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs b/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs index ce6b4c7263..a9438d33b7 100644 --- a/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs +++ b/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs @@ -15,7 +15,7 @@ namespace Avalonia.Native private bool _exported = false; private IAvnWindow _nativeWindow; private NativeMenu _menu; - private IAvnMenu _nativeMenu; + private IAvnMenu _nativeMenu; public AvaloniaNativeMenuExporter(IAvnWindow nativeWindow, IAvaloniaNativeFactory factory) { @@ -43,9 +43,9 @@ namespace Avalonia.Native DoLayoutReset(); } - internal void InvalidateMenu () + internal void InvalidateMenu() { - if(_resetQueued) + if (_resetQueued) { DoLayoutReset(); } @@ -142,7 +142,7 @@ namespace Avalonia.Native setMenu = true; } } - + _nativeMenu.Update(_factory, appMenuHolder); if (setMenu) @@ -164,7 +164,7 @@ namespace Avalonia.Native _nativeMenu.Initialise(this, menu, ""); } } - + _nativeMenu.Update(_factory, menu); avnWindow.SetMainMenu(_nativeMenu); diff --git a/src/Avalonia.Native/IAvnMenu.cs b/src/Avalonia.Native/IAvnMenu.cs index 9abc818e9b..b2141cc1a8 100644 --- a/src/Avalonia.Native/IAvnMenu.cs +++ b/src/Avalonia.Native/IAvnMenu.cs @@ -30,7 +30,7 @@ namespace Avalonia.Native.Interop private Dictionary _menuItemLookup = new Dictionary(); private CompositeDisposable _propertyDisposables = new CompositeDisposable(); - internal void RaiseNeedsUpdate () + internal void RaiseNeedsUpdate() { (ManagedMenu as INativeMenuExporterEventsImplBridge).RaiseNeedsUpdate(); @@ -39,7 +39,7 @@ namespace Avalonia.Native.Interop internal NativeMenu ManagedMenu { get; private set; } - public static IAvnMenu Create (IAvaloniaNativeFactory factory) + public static IAvnMenu Create(IAvaloniaNativeFactory factory) { var events = new MenuEvents(); @@ -54,7 +54,7 @@ namespace Avalonia.Native.Interop protected override void Dispose(bool disposing) { - if(disposing) + if (disposing) { _events.Dispose(); } diff --git a/src/Avalonia.Native/IAvnMenuItem.cs b/src/Avalonia.Native/IAvnMenuItem.cs index 6c1177f9cf..a41e461e37 100644 --- a/src/Avalonia.Native/IAvnMenuItem.cs +++ b/src/Avalonia.Native/IAvnMenuItem.cs @@ -7,7 +7,7 @@ namespace Avalonia.Native.Interop { public partial class IAvnMenuItem { - private IAvnMenu _subMenu; + private IAvnMenu _subMenu; private CompositeDisposable _propertyDisposables = new CompositeDisposable(); private IDisposable _currentActionDisposable; @@ -104,8 +104,8 @@ namespace Avalonia.Native.Interop } internal void Update(AvaloniaNativeMenuExporter exporter, IAvaloniaNativeFactory factory, NativeMenuItem item) - { - if(item != ManagedMenuItem) + { + if (item != ManagedMenuItem) { throw new ArgumentException("The item does not match the menuitem being updated.", nameof(item)); }