Browse Source

more review fixes.

pull/6560/head
Dan Walmsley 5 years ago
parent
commit
597239c92a
  1. 7
      src/Windows/Avalonia.Win32/TrayIconImpl.cs
  2. 10
      src/Windows/Avalonia.Win32/Win32NativeToManagedMenuExporter.cs

7
src/Windows/Avalonia.Win32/TrayIconImpl.cs

@ -205,13 +205,12 @@ namespace Avalonia.Win32
}); });
} }
class TrayIconManagedPopupPositionerPopupImplHelper : IManagedPopupPositionerPopup private class TrayIconManagedPopupPositionerPopupImplHelper : IManagedPopupPositionerPopup
{ {
public delegate void MoveResizeDelegate(PixelPoint position, Size size, double scaling); private readonly Action<PixelPoint, Size, double> _moveResize;
private readonly MoveResizeDelegate _moveResize;
private readonly Window _hiddenWindow; private readonly Window _hiddenWindow;
public TrayIconManagedPopupPositionerPopupImplHelper(MoveResizeDelegate moveResize) public TrayIconManagedPopupPositionerPopupImplHelper(Action<PixelPoint, Size, double> moveResize)
{ {
_moveResize = moveResize; _moveResize = moveResize;
_hiddenWindow = new Window(); _hiddenWindow = new Window();

10
src/Windows/Avalonia.Win32/Win32NativeToManagedMenuExporter.cs

@ -17,13 +17,11 @@ namespace Avalonia.Win32
private IEnumerable<MenuItem> Populate (NativeMenu nativeMenu) private IEnumerable<MenuItem> Populate (NativeMenu nativeMenu)
{ {
var items = new List<MenuItem>();
foreach (var menuItem in nativeMenu.Items) foreach (var menuItem in nativeMenu.Items)
{ {
if (menuItem is NativeMenuItemSeparator) if (menuItem is NativeMenuItemSeparator)
{ {
items.Add(new MenuItem { Header = "-" }); yield return new MenuItem { Header = "-" };
} }
else if (menuItem is NativeMenuItem item) else if (menuItem is NativeMenuItem item)
{ {
@ -35,14 +33,12 @@ namespace Avalonia.Win32
} }
else if (item.HasClickHandlers && item is INativeMenuItemExporterEventsImplBridge bridge) else if (item.HasClickHandlers && item is INativeMenuItemExporterEventsImplBridge bridge)
{ {
newItem.Click += (s, e) => bridge.RaiseClicked(); newItem.Click += (_, __) => bridge.RaiseClicked();
} }
items.Add(newItem); yield return newItem;
} }
} }
return items;
} }
public IEnumerable<MenuItem>? GetMenu () public IEnumerable<MenuItem>? GetMenu ()

Loading…
Cancel
Save