From a7f3fbe988614ccd71ed7f636825be21e67d684c Mon Sep 17 00:00:00 2001 From: Jumar Macato <16554748+jmacato@users.noreply.github.com> Date: Thu, 23 Sep 2021 11:08:00 +0800 Subject: [PATCH] more refactoring --- src/Avalonia.X11/X11TrayIconImpl.cs | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/Avalonia.X11/X11TrayIconImpl.cs b/src/Avalonia.X11/X11TrayIconImpl.cs index 682e431c9a..1d8db8f929 100644 --- a/src/Avalonia.X11/X11TrayIconImpl.cs +++ b/src/Avalonia.X11/X11TrayIconImpl.cs @@ -120,15 +120,15 @@ namespace Avalonia.X11 public void SetIsVisible(bool visible) { if (con == null || _isDisposed || !_ctorFinished) return; - + if (visible & !_isActive) { - DestroyTrayIcon(); - CreateTrayIcon(); + DestroyTrayIcon(); + CreateTrayIcon(); } else if (!visible & _isActive) { - DestroyTrayIcon(); + DestroyTrayIcon(); } } @@ -139,8 +139,7 @@ namespace Avalonia.X11 _statusNotifierItemDbusObj?.SetTitleAndTooltip(_tooltipText); } } - - + /// /// DBus Object used for setting system tray icons. /// @@ -285,7 +284,7 @@ namespace Avalonia.X11 } [DBusInterface("org.kde.StatusNotifierItem")] - interface IStatusNotifierItem : IDBusObject + internal interface IStatusNotifierItem : IDBusObject { Task ContextMenuAsync(int X, int Y); Task ActivateAsync(int X, int Y); @@ -364,7 +363,7 @@ namespace Avalonia.X11 } } - public readonly struct DbusPixmap + internal readonly struct DbusPixmap { public readonly int Width; public readonly int Height;