From 5d415375052af2d4adb2bdbcfee69ede7441d42a Mon Sep 17 00:00:00 2001
From: sithlord48 <sithlord48@gmail.com>
Date: Tue, 7 Jan 2025 00:27:03 -0500
Subject: [PATCH] refactor: remove macOS check for icon theme macOS 11+ uses a
 mask

---
 src/apps/deskflow-gui/MainWindow.cpp | 18 +++---------------
 src/lib/gui/OSXHelpers.h             |  8 --------
 src/lib/gui/OSXHelpers.mm            |  9 ---------
 3 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/src/apps/deskflow-gui/MainWindow.cpp b/src/apps/deskflow-gui/MainWindow.cpp
index 58738204c..e7f16e1f1 100644
--- a/src/apps/deskflow-gui/MainWindow.cpp
+++ b/src/apps/deskflow-gui/MainWindow.cpp
@@ -689,23 +689,11 @@ void MainWindow::setIcon()
 {
   QIcon icon;
 #ifdef Q_OS_MAC
-  switch (getOSXIconsTheme()) {
-  case IconsTheme::ICONS_DARK:
-    icon.addFile(kDarkIconFile);
-    break;
-  case IconsTheme::ICONS_LIGHT:
-    icon.addFile(kLightIconFile);
-    break;
-  case IconsTheme::ICONS_TEMPLATE:
-  default:
-    icon.addFile(kDarkIconFile);
-    icon.setIsMask(true);
-    break;
-  }
+  icon.addFile(kDarkIconFile);
+  icon.setIsMask(true);
 #else
-  icon.addFile(kIconFile);
+  QIcon icon(kIconFile);
 #endif
-
   m_trayIcon->setIcon(icon);
 }
 
diff --git a/src/lib/gui/OSXHelpers.h b/src/lib/gui/OSXHelpers.h
index b76671842..8d1d6076d 100644
--- a/src/lib/gui/OSXHelpers.h
+++ b/src/lib/gui/OSXHelpers.h
@@ -19,17 +19,9 @@
 
 #include <QString>
 
-enum class IconsTheme
-{
-  ICONS_DARK,
-  ICONS_LIGHT,
-  ICONS_TEMPLATE
-};
-
 void requestOSXNotificationPermission();
 bool isOSXDevelopmentBuild();
 bool showOSXNotification(const QString &title, const QString &body);
 bool isOSXInterfaceStyleDark();
 void forceAppActive();
 void macOSNativeHide();
-IconsTheme getOSXIconsTheme();
diff --git a/src/lib/gui/OSXHelpers.mm b/src/lib/gui/OSXHelpers.mm
index eb6b22f4b..6f27944ab 100644
--- a/src/lib/gui/OSXHelpers.mm
+++ b/src/lib/gui/OSXHelpers.mm
@@ -118,12 +118,3 @@ void macOSNativeHide()
   [NSApp hide:nil];
   [[NSApplication sharedApplication] setActivationPolicy:NSApplicationActivationPolicyAccessory];
 }
-
-IconsTheme getOSXIconsTheme()
-{
-  if (@available(macOS 11, *))
-    return IconsTheme::ICONS_TEMPLATE;
-  else if (isOSXInterfaceStyleDark())
-    return IconsTheme::ICONS_DARK;
-  return IconsTheme::ICONS_LIGHT;
-}