smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: remove macOS check for icon theme macOS 11+ uses a mask

Browse source
This commit is contained in:
sithlord48 2025-01-07 00:27:03 -05:00 committed by Nick Bolton
parent f505bfd3e7
commit 5d41537505
3 changed files with 3 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/apps/deskflow-gui/MainWindow.cpp
View file

@ -689,23 +689,11 @@ void MainWindow::setIcon()
{ {
QIcon icon; QIcon icon;
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
switch (getOSXIconsTheme()) { icon.addFile(kDarkIconFile);
case IconsTheme::ICONS_DARK: icon.setIsMask(true);
icon.addFile(kDarkIconFile);
break;
case IconsTheme::ICONS_LIGHT:
icon.addFile(kLightIconFile);
break;
case IconsTheme::ICONS_TEMPLATE:
default:
icon.addFile(kDarkIconFile);
icon.setIsMask(true);
break;
}
#else #else
icon.addFile(kIconFile); QIcon icon(kIconFile);
#endif #endif
m_trayIcon->setIcon(icon); m_trayIcon->setIcon(icon);
} }

8
src/lib/gui/OSXHelpers.h
View file

@ -19,17 +19,9 @@
#include <QString> #include <QString>
enum class IconsTheme
{
ICONS_DARK,
ICONS_LIGHT,
ICONS_TEMPLATE
};
void requestOSXNotificationPermission(); void requestOSXNotificationPermission();
bool isOSXDevelopmentBuild(); bool isOSXDevelopmentBuild();
bool showOSXNotification(const QString &title, const QString &body); bool showOSXNotification(const QString &title, const QString &body);
bool isOSXInterfaceStyleDark(); bool isOSXInterfaceStyleDark();
void forceAppActive(); void forceAppActive();
void macOSNativeHide(); void macOSNativeHide();
IconsTheme getOSXIconsTheme();

9
src/lib/gui/OSXHelpers.mm
View file

@ -118,12 +118,3 @@ void macOSNativeHide()
[NSApp hide:nil]; [NSApp hide:nil];
[[NSApplication sharedApplication] setActivationPolicy:NSApplicationActivationPolicyAccessory]; [[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;
}