Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

macOS theme switching #276

Merged
merged 4 commits into from
Mar 2, 2024
Merged

macOS theme switching #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f48ab30
CMakeLists: last changes for macOS specific libs
TheMorc Feb 28, 2024
15e220e
abaddon.cpp: add support for macOS theme changing
TheMorc Feb 28, 2024
d21334f
format
ouwou Mar 2, 2024
9e00116
format cmakelists too
ouwou Mar 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 7 additions & 13 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ file(GLOB_RECURSE ABADDON_SOURCES
"src/*.h"
"src/*.hpp"
"src/*.cpp"
)
)

list(FILTER ABADDON_SOURCES EXCLUDE REGEX ".*notifier_gio\\.cpp$")
list(FILTER ABADDON_SOURCES EXCLUDE REGEX ".*notifier_fallback\\.cpp$")
Expand Down Expand Up @@ -148,6 +148,12 @@ endif ()

set(USE_MINIAUDIO FALSE)

if (APPLE)
target_link_libraries(abaddon "-framework CoreFoundation")
target_link_libraries(abaddon "-framework CoreAudio")
target_link_libraries(abaddon "-framework AudioToolbox")
endif ()

if (ENABLE_VOICE)
target_compile_definitions(abaddon PRIVATE WITH_VOICE)

Expand Down Expand Up @@ -194,12 +200,6 @@ if (ENABLE_VOICE)
target_link_libraries(abaddon rnnoise::rnnoise)
endif ()
endif ()

if (APPLE)
target_link_libraries(abaddon "-framework CoreFoundation")
target_link_libraries(abaddon "-framework CoreAudio")
target_link_libraries(abaddon "-framework AudioToolbox")
endif ()
endif ()

if (${ENABLE_NOTIFICATION_SOUNDS})
Expand All @@ -214,12 +214,6 @@ if (USE_MINIAUDIO)
PATH_SUFFIXES miniaudio
REQUIRED)

if (APPLE)
target_link_libraries(abaddon "-framework CoreFoundation")
target_link_libraries(abaddon "-framework CoreAudio")
target_link_libraries(abaddon "-framework AudioToolbox")
endif ()

target_include_directories(abaddon PUBLIC ${MINIAUDIO_INCLUDE_DIR})
target_compile_definitions(abaddon PRIVATE WITH_MINIAUDIO)
endif ()
28 changes: 28 additions & 0 deletions src/abaddon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,23 @@
#include "remoteauth/remoteauthdialog.hpp"
#include "util.hpp"

#if defined(__APPLE__)
#include <CoreFoundation/CoreFoundation.h>

void macOSThemeChanged() {
CFPropertyListRef appearanceName = CFPreferencesCopyAppValue(CFSTR("AppleInterfaceStyle"), kCFPreferencesAnyApplication);
if (appearanceName != NULL && CFGetTypeID(appearanceName) == CFStringGetTypeID() && CFStringCompare((CFStringRef)appearanceName, CFSTR("Dark"), 0) == kCFCompareEqualTo) {
Gtk::Settings::get_default()->set_property("gtk-application-prefer-dark-theme", true);
} else {
Gtk::Settings::get_default()->set_property("gtk-application-prefer-dark-theme", false);
}
}

void macOSThemeChangedCallback(CFNotificationCenterRef center, void *observer, CFStringRef name, const void *object, CFDictionaryRef userInfo) {
macOSThemeChanged();
}
#endif

#ifdef WITH_LIBHANDY
#include <handy.h>
#endif
Expand Down Expand Up @@ -331,6 +348,17 @@ int Abaddon::StartGTK() {
m_gtk_app->hold();
m_main_window->show();

#if defined(__APPLE__)
CFNotificationCenterAddObserver(CFNotificationCenterGetDistributedCenter(),
NULL,
macOSThemeChangedCallback,
CFSTR("AppleInterfaceThemeChangedNotification"),
NULL,
CFNotificationSuspensionBehaviorCoalesce);

macOSThemeChanged();
#endif

RunFirstTimeDiscordStartup();

return m_gtk_app->run(*m_main_window);
Expand Down
Loading