Skip to content

MacOS and CMake improvements #19

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

Open
dmikushin wants to merge 4 commits into
base: master
Choose a base branch
from
Open

MacOS and CMake improvements #19

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
05c803a
Update CMakeLists.txt
mk124 Jun 27, 2023
a5e8a41
Update tray.h
mk124 Jun 27, 2023
f27f49d
Icon image: use bundle resource path first
mk124 Aug 20, 2023
c349bf2
Merge branch 'main' of github.com:StirlingLabs/tray
mk124 Aug 26, 2023
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
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ else()
endif()
endif()

add_library(tray SHARED ${SRCS})
add_library(tray STATIC ${SRCS})
set_property(TARGET tray PROPERTY C_STANDARD 99)
target_compile_definitions(tray PRIVATE TRAY_EXPORTS)
target_include_directories(tray SYSTEM PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
set_target_properties(tray PROPERTIES C_VISIBILITY_PRESET hidden)

if(WIN32)
Expand Down
14 changes: 1 addition & 13 deletions tray.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,7 @@ extern "C"
{
#endif

#if WIN32
#ifdef TRAY_EXPORTS
#define TRAY_EXPORT __declspec(dllexport)
#else
#define TRAY_EXPORT __declspec(dllimport)
#endif
#else
#if __GNUC__ >= 4 || defined(__clang__)
#define TRAY_EXPORT extern __attribute__((visibility("default")))
#else
#define TRAY_EXPORT extern
#endif
#endif
#define TRAY_EXPORT

struct tray {
const char *icon_filepath;
Expand Down
3 changes: 2 additions & 1 deletion tray_darwin.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ int tray_loop(int blocking) {
void tray_update(struct tray *tray) {
tray_instance = tray;
double iconHeight = [[NSStatusBar systemStatusBar] thickness];
NSImage *image = [[NSImage alloc] initWithContentsOfFile:[NSString stringWithUTF8String:tray_instance->icon_filepath]];
NSImage *image = [NSImage imageNamed:[NSString stringWithUTF8String:tray_instance->icon_filepath]];
if (image == nil) image = [[NSImage alloc] initWithContentsOfFile:[NSString stringWithUTF8String:tray_instance->icon_filepath]];
double width = image.size.width * (iconHeight / image.size.height);
[image setSize:NSMakeSize(width, iconHeight)];
statusItem.button.image = image;
Expand Down