Browse Source

feat(Native): Address rule CA1822

pull/9189/head
Giuseppe Lippolis 4 years ago
parent
commit
3a9404171f
  1. 6
      src/Avalonia.Native/AvaloniaNativeDragSource.cs
  2. 4
      src/Avalonia.Native/AvaloniaNativeMenuExporter.cs
  3. 4
      src/Avalonia.Native/IAvnMenu.cs

6
src/Avalonia.Native/AvaloniaNativeDragSource.cs

@ -19,8 +19,8 @@ namespace Avalonia.Native
{ {
_factory = factory; _factory = factory;
} }
TopLevel FindRoot(IInteractive interactive) static TopLevel FindRoot(IInteractive interactive)
{ {
while (interactive != null && !(interactive is IVisual)) while (interactive != null && !(interactive is IVisual))
interactive = interactive.InteractiveParent; interactive = interactive.InteractiveParent;
@ -48,7 +48,7 @@ namespace Avalonia.Native
public Task<DragDropEffects> DoDragDrop(PointerEventArgs triggerEvent, IDataObject data, DragDropEffects allowedEffects) public Task<DragDropEffects> DoDragDrop(PointerEventArgs triggerEvent, IDataObject data, DragDropEffects allowedEffects)
{ {
// Sanity check // Sanity check
var tl = FindRoot(triggerEvent.Source); var tl = AvaloniaNativeDragSource.FindRoot(triggerEvent.Source);
var view = tl?.PlatformImpl as WindowBaseImpl; var view = tl?.PlatformImpl as WindowBaseImpl;
if (view == null) if (view == null)
throw new ArgumentException(); throw new ArgumentException();

4
src/Avalonia.Native/AvaloniaNativeMenuExporter.cs

@ -65,7 +65,7 @@ namespace Avalonia.Native
} }
} }
private NativeMenu CreateDefaultAppMenu() private static NativeMenu CreateDefaultAppMenu()
{ {
var result = new NativeMenu(); var result = new NativeMenu();
@ -167,7 +167,7 @@ namespace Avalonia.Native
if (appMenu == null) if (appMenu == null)
{ {
appMenu = CreateDefaultAppMenu(); appMenu = AvaloniaNativeMenuExporter.CreateDefaultAppMenu();
NativeMenu.SetMenu(Application.Current, appMenu); NativeMenu.SetMenu(Application.Current, appMenu);
} }

4
src/Avalonia.Native/IAvnMenu.cs

@ -111,7 +111,7 @@ namespace Avalonia.Native.Interop.Impl
private __MicroComIAvnMenuItemProxy CreateNewAt(IAvaloniaNativeFactory factory, int index, NativeMenuItemBase item) private __MicroComIAvnMenuItemProxy CreateNewAt(IAvaloniaNativeFactory factory, int index, NativeMenuItemBase item)
{ {
var result = CreateNew(factory, item); var result = __MicroComIAvnMenuProxy.CreateNew(factory, item);
result.Initialize(item); result.Initialize(item);
@ -123,7 +123,7 @@ namespace Avalonia.Native.Interop.Impl
return result; return result;
} }
private __MicroComIAvnMenuItemProxy CreateNew(IAvaloniaNativeFactory factory, NativeMenuItemBase item) private static __MicroComIAvnMenuItemProxy CreateNew(IAvaloniaNativeFactory factory, NativeMenuItemBase item)
{ {
var nativeItem = (__MicroComIAvnMenuItemProxy)(item is NativeMenuItemSeparator ? var nativeItem = (__MicroComIAvnMenuItemProxy)(item is NativeMenuItemSeparator ?
factory.CreateMenuItemSeparator() : factory.CreateMenuItemSeparator() :

Loading…
Cancel
Save