CodeCow/deskflow
1
0
Fork 0
mirror of https://github.com/deskflow/deskflow.git synced 2026-06-25 21:12:01 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

SYNERGY-1006 - Added template mode for icons on Big Sur and higher

Browse Source
This commit is contained in:
Igor Sikachyna 2021-06-10 14:15:07 +03:00
parent 974652494a
commit 534fcfa2f0
3 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/gui/src/MainWindow.cpp
View File

@ -343,10 +343,20 @@ void MainWindow::setIcon(qSynergyState state) const
QIcon icon;
#ifdef Q_OS_MAC
if (isOSXUseDarkIcons())
icon.addFile(synergyDarkIconFiles[state]);
else
icon.addFile(synergyLightIconFiles[state]);
IconsTheme theme = getOSXIconsTheme();
switch(getOSXIconsTheme()) {
case IconsTheme::ICONS_DARK:
icon.addFile(synergyDarkIconFiles[state]);
break;
case IconsTheme::ICONS_LIGHT:
icon.addFile(synergyLightIconFiles[state]);
break;
case IconsTheme::ICONS_TEMPLATE:
default:
icon.addFile(synergyDarkIconFiles[state]);
icon.setIsMask(true);
break;
}
#else
icon.addFile(synergyDefaultIconFiles[state]);
#endif

8
src/gui/src/OSXHelpers.h
View File

@ -19,7 +19,13 @@
#define OSXHELPERS__H
enum IconsTheme {
ICONS_DARK,
ICONS_LIGHT,
ICONS_TEMPLATE
};
bool isOSXInterfaceStyleDark();
bool isOSXUseDarkIcons();
IconsTheme getOSXIconsTheme();
#endif

15
src/gui/src/OSXHelpers.mm
View File

@ -30,13 +30,12 @@ isOSXInterfaceStyleDark()
return (style && [style isKindOfClass:[NSString class]] && NSOrderedSame == [style caseInsensitiveCompare:@"dark"]);
}
bool
isOSXUseDarkIcons()
IconsTheme
getOSXIconsTheme()
{
if (@available(macOS 11, *)) {
return true;
}
else {
return isOSXInterfaceStyleDark();
}
if (@available(macOS 11, *))
return IconsTheme::ICONS_TEMPLATE;
else if(isOSXInterfaceStyleDark())
return IconsTheme::ICONS_DARK;
return IconsTheme::ICONS_LIGHT;
}