Merge pull request #504 from tiwoc/macos-tray-image

Let tray image blend into macOS menu bar
debauchee · Nov 21, 2019 · d8e0394 · d8e0394
2 parents 1246ec3 + 8ef0668
commit d8e0394
Show file tree

Hide file tree

Showing 8 changed files with 381 additions and 2 deletions.
diff --git a/src/gui/res/Barrier.qrc b/src/gui/res/Barrier.qrc
@@ -54,5 +54,8 @@
         <file>image/spinning-wheel.gif</file>
         <file>icons/16x16/padlock.png</file>
         <file>icons/16x16/barrier-transfering.png</file>
+        <file>icons/32x32/barrier-connected-mask.png</file>
+        <file>icons/32x32/barrier-disconnected-mask.png</file>
+        <file>icons/32x32/barrier-transfering-mask.png</file>
     </qresource>
 </RCC>
diff --git a/src/gui/res/icons/32x32/barrier-connected-mask.png b/src/gui/res/icons/32x32/barrier-connected-mask.png
diff --git a/src/gui/res/icons/32x32/barrier-connected-mask.svg b/src/gui/res/icons/32x32/barrier-connected-mask.svg
diff --git a/src/gui/res/icons/32x32/barrier-disconnected-mask.png b/src/gui/res/icons/32x32/barrier-disconnected-mask.png
diff --git a/src/gui/res/icons/32x32/barrier-disconnected-mask.svg b/src/gui/res/icons/32x32/barrier-disconnected-mask.svg
diff --git a/src/gui/res/icons/32x32/barrier-transfering-mask.png b/src/gui/res/icons/32x32/barrier-transfering-mask.png
diff --git a/src/gui/res/icons/32x32/barrier-transfering-mask.svg b/src/gui/res/icons/32x32/barrier-transfering-mask.svg
diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
@@ -67,10 +67,17 @@ static const QString barrierConfigFilter(QObject::tr("Barrier Configurations (*.
 
 static const char* barrierIconFiles[] =
 {
+#if defined(Q_OS_MAC)
+    ":/res/icons/32x32/barrier-disconnected-mask.png",
+    ":/res/icons/32x32/barrier-disconnected-mask.png",
+    ":/res/icons/32x32/barrier-connected-mask.png",
+    ":/res/icons/32x32/barrier-transfering-mask.png"
+#else
     ":/res/icons/16x16/barrier-disconnected.png",
     ":/res/icons/16x16/barrier-disconnected.png",
     ":/res/icons/16x16/barrier-connected.png",
     ":/res/icons/16x16/barrier-transfering.png"
+#endif
 };
 
 static const char* barrierLargeIcon = ":/res/icons/256x256/barrier.ico";
@@ -288,8 +295,13 @@ void MainWindow::saveSettings()
 
 void MainWindow::setIcon(qBarrierState state)
 {
-    if (m_pTrayIcon)
-        m_pTrayIcon->setIcon(QIcon(barrierIconFiles[state]));
+    if (m_pTrayIcon) {
+        QIcon icon = QIcon(barrierIconFiles[state]);
+#if defined(Q_OS_MAC)
+        icon.setIsMask(true);
+#endif
+        m_pTrayIcon->setIcon(icon);
+    }
 }
 
 void MainWindow::trayActivated(QSystemTrayIcon::ActivationReason reason)