Mirrors/SketchyBar
2
0
Fork 0
mirror of https://github.com/FelixKratz/SketchyBar synced 2024-11-23 11:53:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

trim syntax for uint32_t underflow prevention

Browse source
This commit is contained in:
Felix Kratz 2022-08-19 14:58:23 +02:00
parent 0410214b27
commit a3a50f9796
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/bar.c
View file

@ -149,15 +149,12 @@ void bar_calculate_bounds(struct bar* bar) {
bar,
POSITION_CENTER);
uint32_t bar_left_first_item_x = g_bar_manager.background.padding_left > 0
? g_bar_manager.background.padding_left
: 0;
uint32_t bar_left_first_item_x = max(g_bar_manager.background.padding_left,
0 );
uint32_t bar_right_first_item_x = bar->window.frame.size.width
- (g_bar_manager.background.padding_right
> 0
? g_bar_manager.background.padding_right
: 0 );
-max(g_bar_manager.background.padding_right,
0 );
uint32_t bar_center_first_item_x = (bar->window.frame.size.width
- 2*g_bar_manager.margin
@ -215,11 +212,11 @@ void bar_calculate_bounds(struct bar* bar) {
uint32_t bar_item_length = bar_item_calculate_bounds(bar_item,
bar->window.frame.size.height
- (g_bar_manager.background.border_width + 1),
(shadow_offsets.x > 0 ? shadow_offsets.x : 0),
max(shadow_offsets.x, 0),
y );
CGRect frame = {{bar->window.origin.x + *next_position
- (shadow_offsets.x > 0 ? shadow_offsets.x : 0),
- max(shadow_offsets.x, 0),
bar->window.origin.y },
{bar_item_display_length
+ shadow_offsets.x
@ -231,7 +228,7 @@ void bar_calculate_bounds(struct bar* bar) {
if (bar_item->group && group_is_first_member(bar_item->group, bar_item)) {
group_calculate_bounds(bar_item->group,
bar,
(shadow_offsets.x > 0 ? shadow_offsets.x : 0),
max(shadow_offsets.x, 0),
y,
bar_item->position == POSITION_RIGHT
|| bar_item->position == POSITION_CENTER_LEFT);

4
src/misc/helpers.h
View file

@ -9,8 +9,8 @@
#include "defines.h"
#define array_count(a) (sizeof((a)) / sizeof(*(a)))
#define max(a, b) a > b ? a : b
#define min(a, b) a < b ? a : b
#define max(a, b) (a > b ? a : b)
#define min(a, b) (a < b ? a : b)
#define MAXLEN 512
#define FORK_TIMEOUT 60