Browse Source

minor nits

pull/6560/head
Takoooooo 5 years ago
parent
commit
7b0fbe6d3a
  1. 6
      src/Avalonia.X11/X11TrayIconImpl.cs
  2. 2
      src/Windows/Avalonia.Win32/Win32NativeToManagedMenuExporter.cs

6
src/Avalonia.X11/X11TrayIconImpl.cs

@ -17,7 +17,7 @@ namespace Avalonia.X11
{ {
internal class X11TrayIconImpl : ITrayIconImpl internal class X11TrayIconImpl : ITrayIconImpl
{ {
private static int s_TrayIconInstanceId; private static int s_trayIconInstanceId;
private readonly ObjectPath _dbusMenuPath; private readonly ObjectPath _dbusMenuPath;
private StatusNotifierItemDbusObj? _statusNotifierItemDbusObj; private StatusNotifierItemDbusObj? _statusNotifierItemDbusObj;
private readonly Connection? _connection; private readonly Connection? _connection;
@ -62,7 +62,7 @@ namespace Avalonia.X11
"org.kde.StatusNotifierWatcher", "org.kde.StatusNotifierWatcher",
"/StatusNotifierWatcher"); "/StatusNotifierWatcher");
} }
catch (Exception) catch
{ {
Logger.TryGet(LogEventLevel.Error, LogArea.X11Platform) Logger.TryGet(LogEventLevel.Error, LogArea.X11Platform)
?.Log(this, ?.Log(this,
@ -73,7 +73,7 @@ namespace Avalonia.X11
return; return;
var pid = Process.GetCurrentProcess().Id; var pid = Process.GetCurrentProcess().Id;
var tid = s_TrayIconInstanceId++; var tid = s_trayIconInstanceId++;
_sysTrayServiceName = $"org.kde.StatusNotifierItem-{pid}-{tid}"; _sysTrayServiceName = $"org.kde.StatusNotifierItem-{pid}-{tid}";
_statusNotifierItemDbusObj = new StatusNotifierItemDbusObj(_dbusMenuPath); _statusNotifierItemDbusObj = new StatusNotifierItemDbusObj(_dbusMenuPath);

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

@ -33,7 +33,7 @@ namespace Avalonia.Win32
} }
else if (item.HasClickHandlers && item is INativeMenuItemExporterEventsImplBridge bridge) else if (item.HasClickHandlers && item is INativeMenuItemExporterEventsImplBridge bridge)
{ {
newItem.Click += (_, __) => bridge.RaiseClicked(); newItem.Click += (_, _) => bridge.RaiseClicked();
} }
yield return newItem; yield return newItem;

Loading…
Cancel
Save