From 082ecc3f370ecd9b9a57b766f0b2220f3b151e2e Mon Sep 17 00:00:00 2001
From: Thomas Luzat <thomas@luzat.com>
Date: Thu, 8 Mar 2018 03:57:14 +0100
Subject: [PATCH] Fix dark tray icon option making all icons dark

Introduces a separate path for tray icons which are neither locked nor
unlocked.

Closes #1556.
---
 src/core/FilePath.cpp  | 10 +++++++++-
 src/core/FilePath.h    |  1 +
 src/gui/MainWindow.cpp |  2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/core/FilePath.cpp b/src/core/FilePath.cpp
index 330542eb..c6f1907a 100644
--- a/src/core/FilePath.cpp
+++ b/src/core/FilePath.cpp
@@ -97,6 +97,15 @@ QString FilePath::wordlistPath(const QString& name)
 }
 
 QIcon FilePath::applicationIcon()
+{
+#ifdef KEEPASSXC_DIST_SNAP
+    return icon("apps", "keepassxc", false);
+#else
+    return icon("apps", "keepassxc");
+#endif
+}
+
+QIcon FilePath::trayIcon()
 {
     bool darkIcon = useDarkIcon();
 
@@ -107,7 +116,6 @@ QIcon FilePath::applicationIcon()
 #endif
 }
 
-
 QIcon FilePath::trayIconLocked()
 {
 #ifdef KEEPASSXC_DIST_SNAP
diff --git a/src/core/FilePath.h b/src/core/FilePath.h
index f84f84e0..b0f0397e 100644
--- a/src/core/FilePath.h
+++ b/src/core/FilePath.h
@@ -29,6 +29,7 @@ public:
     QString pluginPath(const QString& name);
     QString wordlistPath(const QString& name);
     QIcon applicationIcon();
+    QIcon trayIcon();
     QIcon trayIconLocked();
     QIcon trayIconUnlocked();
     QIcon icon(const QString& category, const QString& name, bool fromTheme = true);
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index 1822c48d..301b80c4 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -899,7 +899,7 @@ void MainWindow::updateTrayIcon()
 
             m_trayIcon->setContextMenu(menu);
             
-            m_trayIcon->setIcon(filePath()->applicationIcon());
+            m_trayIcon->setIcon(filePath()->trayIcon());
             m_trayIcon->show();
         }
         if (m_ui->tabWidget->hasLockableDatabases()) {