Browse Source

remove unnecessary async Tasks and replace them with non-async Task.FromResult

pull/6560/head
Jumar Macato 5 years ago
parent
commit
285e483cf9
No known key found for this signature in database GPG Key ID: 85076C4D9D3155A3
  1. 61
      src/Avalonia.X11/X11TrayIconImpl.cs

61
src/Avalonia.X11/X11TrayIconImpl.cs

@ -43,7 +43,7 @@ namespace Avalonia.X11
?.Log(this, "Unable to get a dbus connection for system tray icons."); ?.Log(this, "Unable to get a dbus connection for system tray icons.");
return; return;
} }
_dbusMenuPath = DBusMenuExporter.GenerateDBusMenuObjPath; _dbusMenuPath = DBusMenuExporter.GenerateDBusMenuObjPath;
MenuExporter = DBusMenuExporter.TryCreateDetachedNativeMenu(_dbusMenuPath, _con); MenuExporter = DBusMenuExporter.TryCreateDetachedNativeMenu(_dbusMenuPath, _con);
CreateTrayIcon(); CreateTrayIcon();
@ -52,8 +52,8 @@ namespace Avalonia.X11
public async void CreateTrayIcon() public async void CreateTrayIcon()
{ {
if(_con is null) return; if (_con is null) return;
_statusNotifierWatcher = _con.CreateProxy<IStatusNotifierWatcher>("org.kde.StatusNotifierWatcher", _statusNotifierWatcher = _con.CreateProxy<IStatusNotifierWatcher>("org.kde.StatusNotifierWatcher",
"/StatusNotifierWatcher"); "/StatusNotifierWatcher");
@ -82,7 +82,7 @@ namespace Avalonia.X11
public async void DestroyTrayIcon() public async void DestroyTrayIcon()
{ {
if(_con is null) return; if (_con is null) return;
_con.UnregisterObject(_statusNotifierItemDbusObj); _con.UnregisterObject(_statusNotifierItemDbusObj);
await _con.UnregisterServiceAsync(_sysTrayServiceName); await _con.UnregisterServiceAsync(_sysTrayServiceName);
@ -179,22 +179,17 @@ namespace Avalonia.X11
InvalidateAll(); InvalidateAll();
} }
public async Task ContextMenuAsync(int X, int Y) public Task ContextMenuAsync(int X, int Y) => Task.CompletedTask;
{
}
public async Task ActivateAsync(int X, int Y) public Task ActivateAsync(int X, int Y)
{ {
ActivationDelegate?.Invoke(); ActivationDelegate?.Invoke();
return Task.CompletedTask;
} }
public async Task SecondaryActivateAsync(int X, int Y) public Task SecondaryActivateAsync(int X, int Y) => Task.CompletedTask;
{
}
public async Task ScrollAsync(int Delta, string Orientation) public Task ScrollAsync(int Delta, string Orientation) => Task.CompletedTask;
{
}
public void InvalidateAll() public void InvalidateAll()
{ {
@ -205,58 +200,52 @@ namespace Avalonia.X11
OnTooltipChanged?.Invoke(); OnTooltipChanged?.Invoke();
} }
public async Task<IDisposable> WatchNewTitleAsync(Action handler, Action<Exception> onError = null) public Task<IDisposable> WatchNewTitleAsync(Action handler, Action<Exception> onError = null)
{ {
OnTitleChanged += handler; OnTitleChanged += handler;
return Disposable.Create(() => OnTitleChanged -= handler); return Task.FromResult(Disposable.Create(() => OnTitleChanged -= handler));
} }
public async Task<IDisposable> WatchNewIconAsync(Action handler, Action<Exception> onError = null) public Task<IDisposable> WatchNewIconAsync(Action handler, Action<Exception> onError = null)
{ {
OnIconChanged += handler; OnIconChanged += handler;
return Disposable.Create(() => OnIconChanged -= handler); return Task.FromResult(Disposable.Create(() => OnIconChanged -= handler));
} }
public async Task<IDisposable> WatchNewAttentionIconAsync(Action handler, Action<Exception> onError = null) public Task<IDisposable> WatchNewAttentionIconAsync(Action handler, Action<Exception> onError = null)
{ {
OnAttentionIconChanged += handler; OnAttentionIconChanged += handler;
return Disposable.Create(() => OnAttentionIconChanged -= handler); return Task.FromResult(Disposable.Create(() => OnAttentionIconChanged -= handler));
} }
public async Task<IDisposable> WatchNewOverlayIconAsync(Action handler, Action<Exception> onError = null) public Task<IDisposable> WatchNewOverlayIconAsync(Action handler, Action<Exception> onError = null)
{ {
OnOverlayIconChanged += handler; OnOverlayIconChanged += handler;
return Disposable.Create(() => OnOverlayIconChanged -= handler); return Task.FromResult(Disposable.Create(() => OnOverlayIconChanged -= handler));
} }
public async Task<IDisposable> WatchNewToolTipAsync(Action handler, Action<Exception> onError = null) public Task<IDisposable> WatchNewToolTipAsync(Action handler, Action<Exception> onError = null)
{ {
OnTooltipChanged += handler; OnTooltipChanged += handler;
return Disposable.Create(() => OnTooltipChanged -= handler); return Task.FromResult(Disposable.Create(() => OnTooltipChanged -= handler));
} }
public async Task<IDisposable> WatchNewStatusAsync(Action<string> handler, Action<Exception> onError = null) public Task<IDisposable> WatchNewStatusAsync(Action<string> handler, Action<Exception> onError = null)
{ {
NewStatusAsync += handler; NewStatusAsync += handler;
return Disposable.Create(() => NewStatusAsync -= handler); return Task.FromResult(Disposable.Create(() => NewStatusAsync -= handler));
} }
public async Task<object> GetAsync(string prop) public Task<object> GetAsync(string prop) => Task.FromResult(new object());
{
return null;
}
public async Task<StatusNotifierItemProperties> GetAllAsync() public Task<StatusNotifierItemProperties> GetAllAsync() => Task.FromResult(_backingProperties);
{
return _backingProperties;
}
public Task SetAsync(string prop, object val) => Task.CompletedTask; public Task SetAsync(string prop, object val) => Task.CompletedTask;
public async Task<IDisposable> WatchPropertiesAsync(Action<PropertyChanges> handler) public Task<IDisposable> WatchPropertiesAsync(Action<PropertyChanges> handler)
{ {
OnPropertyChange += handler; OnPropertyChange += handler;
return Disposable.Create(() => OnPropertyChange -= handler); return Task.FromResult(Disposable.Create(() => OnPropertyChange -= handler));
} }
public void SetIcon(DbusPixmap dbusPixmap) public void SetIcon(DbusPixmap dbusPixmap)

Loading…
Cancel
Save