diff --git a/src/animation.h b/src/animation.h index 834b5b05..3123d40d 100644 --- a/src/animation.h +++ b/src/animation.h @@ -70,13 +70,13 @@ typedef ANIMATOR_FUNCTION(animator_function); #define ANIMATION_FUNCTION(name) double name(double x); typedef ANIMATION_FUNCTION(animation_function); -#define INTERP_FUNCTION_LINEAR 'l' -#define INTERP_FUNCTION_QUADRATIC 'q' -#define INTERP_FUNCTION_SIN 's' -#define INTERP_FUNCTION_TANH 't' -#define INTERP_FUNCTION_BOUNCE 'b' -#define INTERP_FUNCTION_EXP 'e' -#define INTERP_FUNCTION_OVERSHOOT 'o' +#define INTERP_FUNCTION_LINEAR 'l' +#define INTERP_FUNCTION_QUADRATIC 'q' +#define INTERP_FUNCTION_SIN 's' +#define INTERP_FUNCTION_TANH 't' +#define INTERP_FUNCTION_BOUNCE 'b' +#define INTERP_FUNCTION_EXP 'e' +#define INTERP_FUNCTION_OVERSHOOT 'o' struct animation { diff --git a/src/sketchybar.m b/src/sketchybar.m index 399aa6c5..d70ea213 100644 --- a/src/sketchybar.m +++ b/src/sketchybar.m @@ -18,7 +18,7 @@ #define MAJOR 2 #define MINOR 12 -#define PATCH 2 +#define PATCH 3 extern int SLSMainConnectionID(void); extern int RunApplicationEventLoop(void); diff --git a/src/window.c b/src/window.c index db6f4af1..8c3100f3 100644 --- a/src/window.c +++ b/src/window.c @@ -120,7 +120,10 @@ bool window_apply_frame(struct window* window) { CFTypeRef frame_region = window_create_region(window, window->frame); if (__builtin_available(macOS 13.0, *)) { - SLSSetWindowShape(g_connection, window->id, g_nirvana.x, g_nirvana.y, frame_region); + SLSSetWindowShape(g_connection, window->id, + g_nirvana.x, + g_nirvana.y, + frame_region); } else { if (window->parent) { SLSOrderWindow(g_connection, window->id, 0, window->parent->id); @@ -150,7 +153,11 @@ bool window_apply_frame(struct window* window) { } void window_send_to_space(struct window* window, uint64_t dsid) { - CFArrayRef window_list = cfarray_of_cfnumbers(&window->id, sizeof(uint32_t), 1, kCFNumberSInt32Type); + CFArrayRef window_list = cfarray_of_cfnumbers(&window->id, + sizeof(uint32_t), + 1, + kCFNumberSInt32Type); + SLSMoveWindowsToManagedSpace(g_connection, window_list, dsid); if (CGPointEqualToPoint(window->origin, g_nirvana)) { SLSMoveWindow(g_connection, window->id, &g_nirvana); diff --git a/src/window.h b/src/window.h index 50e67a79..a226874f 100644 --- a/src/window.h +++ b/src/window.h @@ -61,7 +61,7 @@ extern CGError SLSSetSurfaceColorSpace(int cid, uint32_t wid, uint32_t surface, #define W_ABOVE 1 #define W_OUT 0 -#define W_BELOW -1 +#define W_BELOW -1 extern CFTypeRef g_transaction;