Fix dark tray icon option making all icons dark

Introduces a separate path for tray icons which are neither locked nor unlocked. Closes keepassxreboot#1556.
frompton · Mar 8, 2018 · 082ecc3 · 082ecc3
1 parent 2fcaeea
commit 082ecc3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git 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
@@ -29,6 +29,7 @@ class FilePath
     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
@@ -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()) {