Browse Source

remove debug code

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

20
src/Avalonia.X11/X11TrayIconImpl.cs

@ -15,14 +15,13 @@ namespace Avalonia.X11
{ {
internal class X11TrayIconImpl : ITrayIconImpl internal class X11TrayIconImpl : ITrayIconImpl
{ {
private static int s_trayIconInstanceId = 0; private static int s_trayIconInstanceId = 0;
private static int GetTID() => s_trayIconInstanceId++; private static int GetTID() => s_trayIconInstanceId++;
private ObjectPath _dbusmenuPath; private ObjectPath _dbusmenuPath;
private StatusNotifierItemDbusObj _statusNotifierItemDbusObj; private StatusNotifierItemDbusObj _statusNotifierItemDbusObj;
private Connection con; private Connection con;
private DbusPixmap _icon; private DbusPixmap _icon;
private IStatusNotifierWatcher _statusNotifierWatcher; private IStatusNotifierWatcher _statusNotifierWatcher;
private string _sysTrayServiceName; private string _sysTrayServiceName;
@ -30,10 +29,10 @@ namespace Avalonia.X11
private bool _isActive; private bool _isActive;
private bool _isDisposed; private bool _isDisposed;
private readonly bool _ctorFinished; private readonly bool _ctorFinished;
public INativeMenuExporter MenuExporter { get; } public INativeMenuExporter MenuExporter { get; }
public Action OnClicked { get; set; } public Action OnClicked { get; set; }
public X11TrayIconImpl() public X11TrayIconImpl()
{ {
con = DBusHelper.TryGetConnection(); con = DBusHelper.TryGetConnection();
@ -42,7 +41,7 @@ namespace Avalonia.X11
CreateTrayIcon(); CreateTrayIcon();
_ctorFinished = true; _ctorFinished = true;
} }
public async void CreateTrayIcon() public async void CreateTrayIcon()
{ {
_statusNotifierWatcher = con.CreateProxy<IStatusNotifierWatcher>("org.kde.StatusNotifierWatcher", _statusNotifierWatcher = con.CreateProxy<IStatusNotifierWatcher>("org.kde.StatusNotifierWatcher",
@ -111,7 +110,7 @@ namespace Avalonia.X11
_icon = new DbusPixmap(w, h, pixByteArray); _icon = new DbusPixmap(w, h, pixByteArray);
_statusNotifierItemDbusObj.SetIcon(_icon); _statusNotifierItemDbusObj.SetIcon(_icon);
} }
public void SetIsVisible(bool visible) public void SetIsVisible(bool visible)
{ {
if (con == null || _isDisposed || !_ctorFinished) return; if (con == null || _isDisposed || !_ctorFinished) return;
@ -134,7 +133,7 @@ namespace Avalonia.X11
_statusNotifierItemDbusObj?.SetTitleAndTooltip(_tooltipText); _statusNotifierItemDbusObj?.SetTitleAndTooltip(_tooltipText);
} }
} }
/// <summary> /// <summary>
/// DBus Object used for setting system tray icons. /// DBus Object used for setting system tray icons.
/// </summary> /// </summary>
@ -232,12 +231,7 @@ namespace Avalonia.X11
public async Task<object> GetAsync(string prop) public async Task<object> GetAsync(string prop)
{ {
if (prop.Contains("Menu")) return null;
{
return _backingProperties.Menu;
}
return default;
} }
public async Task<StatusNotifierItemProperties> GetAllAsync() public async Task<StatusNotifierItemProperties> GetAllAsync()

Loading…
Cancel
Save