Mirrors/SketchyBar
2
0
Fork 0
mirror of https://github.com/FelixKratz/SketchyBar synced 2025-02-17 13:08:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

modularize bar drawing

Browse source
This commit is contained in:
FelixKratz 2021-09-05 11:55:54 +02:00
parent 4e26383e02
commit 381f7366f3
1 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/bar.c
View file

@ -145,12 +145,9 @@ int bar_get_center_length(struct bar_manager* bar_manager) {
return total_length;
}
bool bar_draw_graphs(struct bar* bar, struct bar_item* bar_item, uint32_t x, bool right_to_left) {
if (bar_item->has_graph) {
bar_draw_graph_line(bar, &bar_item->graph_data, x, 0, right_to_left);
return true;
}
return false;
void bar_draw_graph(struct bar* bar, struct bar_item* bar_item, uint32_t x, bool right_to_left) {
if (!bar_item->has_graph) return;
bar_draw_graph_line(bar, &bar_item->graph_data, x, 0, right_to_left);
}
void bar_refresh_components(struct bar *bar) {
@ -172,9 +169,7 @@ void bar_refresh_components(struct bar *bar) {
}
}
void bar_refresh(struct bar *bar) {
SLSDisableUpdate(g_connection);
SLSOrderWindow(g_connection, bar->id, -1, 0);
void bar_draw_background(struct bar* bar) {
CGContextClearRect(bar->context, bar->frame);
CGContextSetRGBFillColor(bar->context, g_bar_manager.background_color.r, g_bar_manager.background_color.g, g_bar_manager.background_color.b, g_bar_manager.background_color.a);
@ -182,6 +177,14 @@ void bar_refresh(struct bar *bar) {
CGPathAddRoundedRect(path, NULL, bar->frame, g_bar_manager.corner_radius, g_bar_manager.corner_radius);
CGContextAddPath(bar->context, path);
CGContextFillPath(bar->context);
CFRelease(path);
}
void bar_refresh(struct bar* bar) {
SLSDisableUpdate(g_connection);
SLSOrderWindow(g_connection, bar->id, -1, 0);
bar_draw_background(bar);
uint32_t did = display_arrangement(bar->did);
uint32_t sid = mission_control_index(display_space_id(bar->did));
@ -200,6 +203,8 @@ void bar_refresh(struct bar *bar) {
struct bar_line* icon = &bar_item->icon_line;
CGPoint icon_position = bar_align_line(bar, *icon, ALIGN_CENTER, ALIGN_CENTER);
CGPoint label_position = bar_align_line(bar, *label, ALIGN_CENTER, ALIGN_CENTER);
uint32_t graph_x = 0;
bool graph_rtl = false;
if (bar_item->position == BAR_POSITION_LEFT) {
icon_position.x = bar_left_final_item_x + bar_item->icon_spacing_left;
@ -207,7 +212,8 @@ void bar_refresh(struct bar *bar) {
if (!bar_item->nospace)
bar_left_final_item_x = label_position.x + label->bounds.size.width + bar_item->label_spacing_right;
if (bar_draw_graphs(bar, bar_item, bar_item->nospace ? label_position.x + label->bounds.size.width + bar_item->label_spacing_right : bar_left_final_item_x, false)) {
if (bar_item->has_graph) {
graph_x = bar_item->nospace ? label_position.x + label->bounds.size.width + bar_item->label_spacing_right : bar_left_final_item_x;
if (!bar_item->nospace)
bar_left_final_item_x += bar_item->graph_data.graph_width;
}
@ -218,7 +224,9 @@ void bar_refresh(struct bar *bar) {
if (!bar_item->nospace)
bar_right_first_item_x = icon_position.x - bar_item->icon_spacing_left;
if (bar_draw_graphs(bar, bar_item, bar_item->nospace ? icon_position.x - bar_item->icon_spacing_left : bar_right_first_item_x, true)) {
if (bar_item->has_graph) {
graph_x = bar_item->nospace ? icon_position.x - bar_item->icon_spacing_left : bar_right_first_item_x;
graph_rtl = true;
if (!bar_item->nospace)
bar_right_first_item_x -= bar_item->graph_data.graph_width;
}
@ -229,13 +237,15 @@ void bar_refresh(struct bar *bar) {
if (!bar_item->nospace)
bar_center_first_item_x = label_position.x + label->bounds.size.width + bar_item->label_spacing_right;
if (bar_draw_graphs(bar, bar_item, bar_item->nospace ? label_position.x + label->bounds.size.width + bar_item->label_spacing_right : bar_center_first_item_x, false)) {
if (bar_item->has_graph) {
graph_x = bar_item->nospace ? label_position.x + label->bounds.size.width + bar_item->label_spacing_right : bar_center_first_item_x;
if (!bar_item->nospace)
bar_center_first_item_x += bar_item->graph_data.graph_width;
}
}
bar_draw_line(bar, *icon, icon_position.x, icon_position.y);
bar_draw_line(bar, *label, label_position.x, label_position.y);
bar_draw_graph(bar, bar_item, graph_x, graph_rtl);
bar_item->label_line.bounds.origin = label_position;
bar_item->icon_line.bounds.origin = icon_position;
bar_item->is_shown = true;