From 95afed5256aff94034a858bcbf072fd5d6b13b92 Mon Sep 17 00:00:00 2001
From: aeghn <aeghn@outlook.com>
Date: Tue, 27 Oct 2020 14:11:11 +0800
Subject: [PATCH] Make barrier try to read tray icons from themes now.

---
 src/gui/src/MainWindow.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index e4604c87..f99904eb 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -80,6 +80,14 @@ static const char* barrierIconFiles[] =
 #endif
 };
 
+static const char* barrierIconNames[] =
+{
+    "barrier-disconnected",
+    "barrier-disconnected",
+    "barrier-connected",
+    "barrier-transfering"
+};
+
 static const char* barrierLargeIcon = ":/res/icons/256x256/barrier.ico";
 
 MainWindow::MainWindow(QSettings& settings, AppConfig& appConfig) :
@@ -296,7 +304,7 @@ void MainWindow::saveSettings()
 void MainWindow::setIcon(qBarrierState state)
 {
     if (m_pTrayIcon) {
-        QIcon icon = QIcon(barrierIconFiles[state]);
+        QIcon icon = QIcon::fromTheme(barrierIconNames[state], QIcon(barrierIconFiles[state]));
 #if defined(Q_OS_MAC)
         icon.setIsMask(true);
 #endif