mirror of
https://github.com/FelixKratz/SketchyBar
synced 2024-09-20 05:51:58 +00:00
respect bracket paddings
This commit is contained in:
parent
d8c11b653b
commit
44cb73e94a
1 changed files with 19 additions and 4 deletions
23
src/bar.c
23
src/bar.c
|
@ -251,17 +251,28 @@ static void bar_calculate_bounds_top_bottom(struct bar* bar) {
|
|||
next_position = &bar_center_left_first_item_x, rtl = true;
|
||||
else continue;
|
||||
|
||||
int group_padding_left = 0;
|
||||
int group_padding_right = 0;
|
||||
|
||||
if (bar_item->group && (bar_item->group->first_item == bar_item))
|
||||
group_padding_left = bar_item->group->members[0]->background.padding_left;
|
||||
|
||||
if (bar_item->group && (bar_item->group->last_item == bar_item))
|
||||
group_padding_right = bar_item->group->members[0]->background.padding_right;
|
||||
|
||||
if (bar_item->position == POSITION_RIGHT
|
||||
|| bar_item->position == POSITION_CENTER_LEFT) {
|
||||
|
||||
*next_position = min(*next_position - bar_item_display_length
|
||||
- bar_item->background.padding_right,
|
||||
- bar_item->background.padding_right
|
||||
- group_padding_right,
|
||||
bar->window.frame.size.width
|
||||
- bar_item_display_length );
|
||||
}
|
||||
else {
|
||||
*next_position += max((int)-*next_position,
|
||||
bar_item->background.padding_left);
|
||||
bar_item->background.padding_left
|
||||
+ group_padding_left );
|
||||
}
|
||||
|
||||
bar_item->graph.rtl = rtl;
|
||||
|
@ -291,14 +302,18 @@ static void bar_calculate_bounds_top_bottom(struct bar* bar) {
|
|||
*next_position += bar_item->has_const_width
|
||||
? bar_item_display_length
|
||||
+ bar_item->background.padding_right
|
||||
+ group_padding_right
|
||||
- bar_item->custom_width
|
||||
: - bar_item->background.padding_left;
|
||||
: (- bar_item->background.padding_left
|
||||
- group_padding_left );
|
||||
} else {
|
||||
*next_position += bar_item->has_const_width
|
||||
? bar_item->custom_width
|
||||
- bar_item->background.padding_left
|
||||
- group_padding_left
|
||||
: (bar_item_length
|
||||
+ bar_item->background.padding_right);
|
||||
+ bar_item->background.padding_right
|
||||
+ group_padding_right );
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue