Mirrors/SketchyBar
2
0
Fork 0
mirror of https://github.com/FelixKratz/SketchyBar synced 2024-09-21 06:21:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

y_offset in bounding rects

Browse source
This commit is contained in:
FelixKratz 2021-10-26 00:32:13 +02:00
parent eaf7de7ee6
commit 7df664e441
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/bar.c
View file

@ -134,10 +134,8 @@ void bar_draw_bar_items(struct bar* bar) {
if (!bar_item->queued_for_redraw || !bar_draws_item(bar, bar_item)) continue;
if (atomic_redraw && bar_item->num_rects >= bar->adid && bar_item->bounding_rects[bar->adid - 1]) {
bar_item->bounding_rects[bar->adid - 1]->origin.x -= bar->origin.x;
bar_item->bounding_rects[bar->adid - 1]->origin.y -= bar->origin.y;
CGRect draw_region = {{bar_item->bounding_rects[bar->adid - 1]->origin.x - bar->origin.x, 0},
{bar_item->bounding_rects[bar->adid - 1]->size.width, bar->frame.size.height}};
{bar_item->bounding_rects[bar->adid - 1]->size.width, bar->frame.size.height}};
draw_rect(bar->context, CGRectInset(draw_region, g_bar_manager.background.border_width, 0), &g_bar_manager.background.color, 0, 0, &g_bar_manager.background.border_color, true);
}
atomic_redraw &= bar_item->redraw_in_place;
@ -153,6 +151,9 @@ void bar_draw_bar_items(struct bar* bar) {
for (int i = 0; i < g_bar_manager.bar_item_count; i++) {
struct bar_item* bar_item = g_bar_manager.bar_items[i];
if (bar_item->update_mask & UPDATE_MOUSE_ENTERED || bar_item->update_mask & UPDATE_MOUSE_EXITED)
SLSAddTrackingRect(g_connection, bar->id, CGRectInset(bar_item_construct_bounding_rect(bar_item), 1, 1));
if (!bar_item->queued_for_redraw && atomic_redraw) continue;
bar_item_remove_associated_bar(bar_item, bar->adid);
@ -161,9 +162,6 @@ void bar_draw_bar_items(struct bar* bar) {
struct text_line* label = &bar_item->label.line;
struct text_line* icon = &bar_item->icon.line;
if (bar_item->update_mask & UPDATE_MOUSE_ENTERED || bar_item->update_mask & UPDATE_MOUSE_EXITED)
SLSAddTrackingRect(g_connection, bar->id, CGRectInset(bar_item_construct_bounding_rect(bar_item), 1, 1));
bar_item_append_associated_bar(bar_item, bar->adid);
bar_item_set_bounding_rect_for_display(bar_item, bar->adid, bar->origin);
@ -269,8 +267,9 @@ void bar_redraw(struct bar* bar) {
bar_item->redraw_in_place = false;
if (g_bar_manager.picky_redraw) {
if (bar_item->num_rects >= bar->adid && bar_item->bounding_rects[bar->adid - 1]) {
if (bar_item->bounding_rects[bar->adid - 1]->origin.x == icon_position.x - bar_item->icon.padding_left + bar->origin.x && !bar_item->needs_update)
if ((bar_item->bounding_rects[bar->adid - 1]->origin.x == icon_position.x - bar_item->icon.padding_left + bar->origin.x) && !bar_item->needs_update) {
bar_item->queued_for_redraw = false;
}
else if (bar_item->bounding_rects[bar->adid - 1]->origin.x == icon_position.x - bar_item->icon.padding_left + bar->origin.x
&& bar_item->needs_update
&& bar_item->bounding_rects[bar->adid - 1]->size.width >= bar_item_construct_bounding_rect(bar_item).size.width)

2
src/bar_item.c
View file

@ -286,7 +286,7 @@ CGRect bar_item_construct_bounding_rect(struct bar_item* bar_item) {
CGRect bounding_rect;
bounding_rect.origin = bar_item->icon.line.bounds.origin;
bounding_rect.origin.x -= bar_item->icon.padding_left;
bounding_rect.origin.y = bar_item->icon.line.bounds.origin.y < bar_item->label.line.bounds.origin.y ? bar_item->icon.line.bounds.origin.y : bar_item->label.line.bounds.origin.y;
bounding_rect.origin.y = bar_item->icon.line.bounds.origin.y < bar_item->label.line.bounds.origin.y ? bar_item->icon.line.bounds.origin.y : bar_item->label.line.bounds.origin.y + bar_item->y_offset;
bounding_rect.size.width = bar_item_get_length(bar_item);
bounding_rect.size.height = bar_item_get_height(bar_item);
return bounding_rect;