qt: apply new runtime icons if running on macOS

Author: kwvg

src/qt/bitcoingui.cpp

@@ -116,8 +116,16 @@ BitcoinGUI::BitcoinGUI(interfaces::Node& node, const NetworkStyle* networkStyle,
 #ifdef ENABLE_WALLET
     enableWallet = WalletModel::isWalletEnabled();
 #endif // ENABLE_WALLET
-    QApplication::setWindowIcon(m_network_style->getTrayAndWindowIcon());
-    setWindowIcon(m_network_style->getTrayAndWindowIcon());
+
+    QIcon icon{m_network_style->getTrayAndWindowIcon()};
+#ifdef Q_OS_MACOS
+    if (auto macos_icon{m_network_style->getMacIcon()}) {
+        icon = macos_icon.value();
+    }
+#endif // Q_OS_MACOS
+    QApplication::setWindowIcon(icon);
+    setWindowIcon(icon);
+
     updateWindowTitle();
 
     rpcConsole = new RPCConsole(node, this, enableWallet ? Qt::Window : Qt::Widget);

src/qt/networkstyle.cpp

@@ -21,12 +21,13 @@ static const struct {
     const char *appName;
     const int iconColorHueShift;
     const int iconColorSaturationReduction;
+    const char *macIconPath;
     const std::string titleAddText;
 } network_styles[] = {
-    {"main", QAPP_APP_NAME_DEFAULT, 0, 0, ""},
-    {"test", QAPP_APP_NAME_TESTNET, 190, 20, ""},
-    {"devnet", QAPP_APP_NAME_DEVNET, 35, 15, "[devnet: %s]"},
-    {"regtest", QAPP_APP_NAME_REGTEST, 160, 30, ""}
+    {"main",    QAPP_APP_NAME_DEFAULT, 0,   0,  ":/icons/dash_macos_mainnet",  ""},
+    {"test",    QAPP_APP_NAME_TESTNET, 190, 20, ":/icons/dash_macos_testnet",  ""},
+    {"devnet",  QAPP_APP_NAME_DEVNET,  35,  15, ":/icons/dash_macos_devnet",   "[devnet: %s]"},
+    {"regtest", QAPP_APP_NAME_REGTEST, 160, 30, ":/icons/dash_macos_regtest",  ""},
 };
 
 void NetworkStyle::rotateColor(QColor& col, const int iconColorHueShift, const int iconColorSaturationReduction)
@@ -62,7 +63,8 @@ void NetworkStyle::rotateColors(QImage& img, const int iconColorHueShift, const
 }
 
 // titleAddText needs to be const char* for tr()
-NetworkStyle::NetworkStyle(const QString &_appName, const int iconColorHueShift, const int iconColorSaturationReduction, const char *_titleAddText):
+NetworkStyle::NetworkStyle(const QString &_appName, const int iconColorHueShift, const int iconColorSaturationReduction,
+                           const char *_macIconPath, const char *_titleAddText, const std::string &networkId):
     appName(_appName),
     titleAddText(qApp->translate("SplashScreen", _titleAddText)),
     badgeColor(QColor(0, 141, 228)) // default badge color is the original Dash's blue, regardless of the current theme
@@ -86,6 +88,12 @@ NetworkStyle::NetworkStyle(const QString &_appName, const int iconColorHueShift,
     appIcon             = QIcon(appIconPixmap);
     trayAndWindowIcon   = QIcon(appIconPixmap.scaled(QSize(256,256)));
     splashImage         = QPixmap(":/images/splash");
+
+#ifdef Q_OS_MAC
+    if (_macIconPath) {
+        m_macos_icon = QIcon(QPixmap(_macIconPath));
+    }
+#endif // Q_OS_MAC
 }
 
 const NetworkStyle* NetworkStyle::instantiate(const std::string& networkId)
@@ -107,7 +115,9 @@ const NetworkStyle* NetworkStyle::instantiate(const std::string& networkId)
                     appName.c_str(),
                     network_style.iconColorHueShift,
                     network_style.iconColorSaturationReduction,
-                    titleAddText.c_str());
+                    network_style.macIconPath,
+                    titleAddText.c_str(),
+                    networkId);
         }
     }
     return nullptr;

src/qt/networkstyle.h

@@ -10,6 +10,8 @@
 #include <QPixmap>
 #include <QString>
 
+#include <optional>
+
 /* Coin network-specific GUI style information */
 class NetworkStyle
 {
@@ -23,16 +25,23 @@ class NetworkStyle
     const QIcon &getTrayAndWindowIcon() const { return trayAndWindowIcon; }
     const QString &getTitleAddText() const { return titleAddText; }
     const QColor &getBadgeColor() const { return badgeColor; }
+#ifdef Q_OS_MAC
+    std::optional<QIcon> getMacIcon() const { return m_macos_icon; }
+#endif // Q_OS_MAC
 
 private:
-    NetworkStyle(const QString &appName, const int iconColorHueShift, const int iconColorSaturationReduction, const char *titleAddText);
+    NetworkStyle(const QString &appName, const int iconColorHueShift, const int iconColorSaturationReduction,
+                 const char *macIconPath, const char *titleAddText, const std::string &networkId);
 
     QString appName;
     QIcon appIcon;
     QPixmap splashImage;
     QIcon trayAndWindowIcon;
     QString titleAddText;
     QColor badgeColor;
+#ifdef Q_OS_MAC
+    std::optional<QIcon> m_macos_icon;
+#endif // Q_OS_MAC
 
     void rotateColor(QColor& col, const int iconColorHueShift, const int iconColorSaturationReduction);
     void rotateColors(QImage& img, const int iconColorHueShift, const int iconColorSaturationReduction);