Browse Source

whitespace

pull/3762/head
Dan Walmsley 7 years ago
parent
commit
a57253c09b
  1. 8
      src/Avalonia.Controls/NativeMenu.cs
  2. 8
      src/Avalonia.Controls/NativeMenuItem.cs
  3. 10
      src/Avalonia.Native/AvaloniaNativeMenuExporter.cs
  4. 6
      src/Avalonia.Native/IAvnMenu.cs
  5. 6
      src/Avalonia.Native/IAvnMenuItem.cs

8
src/Avalonia.Controls/NativeMenu.cs

@ -26,7 +26,7 @@ namespace Avalonia.Controls
_items.CollectionChanged += ItemsChanged; _items.CollectionChanged += ItemsChanged;
} }
void INativeMenuExporterEventsImplBridge.RaiseNeedsUpdate () void INativeMenuExporterEventsImplBridge.RaiseNeedsUpdate()
{ {
Opening?.Invoke(this, EventArgs.Empty); Opening?.Invoke(this, EventArgs.Empty);
} }
@ -39,10 +39,10 @@ namespace Avalonia.Controls
private void ItemsChanged(object sender, NotifyCollectionChangedEventArgs e) private void ItemsChanged(object sender, NotifyCollectionChangedEventArgs e)
{ {
if(e.OldItems!=null) if (e.OldItems != null)
foreach (NativeMenuItemBase i in e.OldItems) foreach (NativeMenuItemBase i in e.OldItems)
i.Parent = null; i.Parent = null;
if(e.NewItems!=null) if (e.NewItems != null)
foreach (NativeMenuItemBase i in e.NewItems) foreach (NativeMenuItemBase i in e.NewItems)
i.Parent = this; i.Parent = this;
} }
@ -57,7 +57,7 @@ namespace Avalonia.Controls
} }
public void Add(NativeMenuItemBase item) => _items.Add(item); public void Add(NativeMenuItemBase item) => _items.Add(item);
public IEnumerator<NativeMenuItemBase> GetEnumerator() => _items.GetEnumerator(); public IEnumerator<NativeMenuItemBase> GetEnumerator() => _items.GetEnumerator();
IEnumerator IEnumerable.GetEnumerator() IEnumerator IEnumerable.GetEnumerator()

8
src/Avalonia.Controls/NativeMenuItem.cs

@ -98,7 +98,7 @@ namespace Avalonia.Controls
{ {
get => _isChecked; get => _isChecked;
set => SetAndRaise(IsCheckedProperty, ref _isChecked, value); set => SetAndRaise(IsCheckedProperty, ref _isChecked, value);
} }
public static readonly DirectProperty<NativeMenuItem, ICommand> CommandProperty = public static readonly DirectProperty<NativeMenuItem, ICommand> CommandProperty =
Button.CommandProperty.AddOwner<NativeMenuItem>( Button.CommandProperty.AddOwner<NativeMenuItem>(
@ -138,12 +138,12 @@ namespace Avalonia.Controls
nameof(ICommand.CanExecuteChanged), _canExecuteChangedSubscriber); nameof(ICommand.CanExecuteChanged), _canExecuteChangedSubscriber);
SetAndRaise(CommandProperty, ref _command, value); SetAndRaise(CommandProperty, ref _command, value);
if (_command != null) if (_command != null)
WeakSubscriptionManager.Subscribe(_command, WeakSubscriptionManager.Subscribe(_command,
nameof(ICommand.CanExecuteChanged), _canExecuteChangedSubscriber); nameof(ICommand.CanExecuteChanged), _canExecuteChangedSubscriber);
CanExecuteChanged(); CanExecuteChanged();
} }
} }

10
src/Avalonia.Native/AvaloniaNativeMenuExporter.cs

@ -15,7 +15,7 @@ namespace Avalonia.Native
private bool _exported = false; private bool _exported = false;
private IAvnWindow _nativeWindow; private IAvnWindow _nativeWindow;
private NativeMenu _menu; private NativeMenu _menu;
private IAvnMenu _nativeMenu; private IAvnMenu _nativeMenu;
public AvaloniaNativeMenuExporter(IAvnWindow nativeWindow, IAvaloniaNativeFactory factory) public AvaloniaNativeMenuExporter(IAvnWindow nativeWindow, IAvaloniaNativeFactory factory)
{ {
@ -43,9 +43,9 @@ namespace Avalonia.Native
DoLayoutReset(); DoLayoutReset();
} }
internal void InvalidateMenu () internal void InvalidateMenu()
{ {
if(_resetQueued) if (_resetQueued)
{ {
DoLayoutReset(); DoLayoutReset();
} }
@ -142,7 +142,7 @@ namespace Avalonia.Native
setMenu = true; setMenu = true;
} }
} }
_nativeMenu.Update(_factory, appMenuHolder); _nativeMenu.Update(_factory, appMenuHolder);
if (setMenu) if (setMenu)
@ -164,7 +164,7 @@ namespace Avalonia.Native
_nativeMenu.Initialise(this, menu, ""); _nativeMenu.Initialise(this, menu, "");
} }
} }
_nativeMenu.Update(_factory, menu); _nativeMenu.Update(_factory, menu);
avnWindow.SetMainMenu(_nativeMenu); avnWindow.SetMainMenu(_nativeMenu);

6
src/Avalonia.Native/IAvnMenu.cs

@ -30,7 +30,7 @@ namespace Avalonia.Native.Interop
private Dictionary<NativeMenuItemBase, IAvnMenuItem> _menuItemLookup = new Dictionary<NativeMenuItemBase, IAvnMenuItem>(); private Dictionary<NativeMenuItemBase, IAvnMenuItem> _menuItemLookup = new Dictionary<NativeMenuItemBase, IAvnMenuItem>();
private CompositeDisposable _propertyDisposables = new CompositeDisposable(); private CompositeDisposable _propertyDisposables = new CompositeDisposable();
internal void RaiseNeedsUpdate () internal void RaiseNeedsUpdate()
{ {
(ManagedMenu as INativeMenuExporterEventsImplBridge).RaiseNeedsUpdate(); (ManagedMenu as INativeMenuExporterEventsImplBridge).RaiseNeedsUpdate();
@ -39,7 +39,7 @@ namespace Avalonia.Native.Interop
internal NativeMenu ManagedMenu { get; private set; } internal NativeMenu ManagedMenu { get; private set; }
public static IAvnMenu Create (IAvaloniaNativeFactory factory) public static IAvnMenu Create(IAvaloniaNativeFactory factory)
{ {
var events = new MenuEvents(); var events = new MenuEvents();
@ -54,7 +54,7 @@ namespace Avalonia.Native.Interop
protected override void Dispose(bool disposing) protected override void Dispose(bool disposing)
{ {
if(disposing) if (disposing)
{ {
_events.Dispose(); _events.Dispose();
} }

6
src/Avalonia.Native/IAvnMenuItem.cs

@ -7,7 +7,7 @@ namespace Avalonia.Native.Interop
{ {
public partial class IAvnMenuItem public partial class IAvnMenuItem
{ {
private IAvnMenu _subMenu; private IAvnMenu _subMenu;
private CompositeDisposable _propertyDisposables = new CompositeDisposable(); private CompositeDisposable _propertyDisposables = new CompositeDisposable();
private IDisposable _currentActionDisposable; private IDisposable _currentActionDisposable;
@ -104,8 +104,8 @@ namespace Avalonia.Native.Interop
} }
internal void Update(AvaloniaNativeMenuExporter exporter, IAvaloniaNativeFactory factory, NativeMenuItem item) 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)); throw new ArgumentException("The item does not match the menuitem being updated.", nameof(item));
} }

Loading…
Cancel
Save