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

background colors working, but more precision needed

Browse source
This commit is contained in:
FelixKratz 2021-09-05 12:44:43 +02:00
parent 4ea3f34238
commit 1ca51e31e3
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/bar.c
View file

@ -183,7 +183,7 @@ void bar_draw_background(struct bar* bar) {
void bar_draw_item_background(struct bar* bar, struct bar_item* bar_item, uint32_t sid) { void bar_draw_item_background(struct bar* bar, struct bar_item* bar_item, uint32_t sid) {
CGRect draw_region = {{bar_item->bounding_rects[sid - 1]->origin.x, bar->frame.origin.y}, {bar_item->bounding_rects[sid - 1]->size.width, bar->frame.size.height}}; CGRect draw_region = {{bar_item->bounding_rects[sid - 1]->origin.x, bar->frame.origin.y}, {bar_item->bounding_rects[sid - 1]->size.width, bar->frame.size.height}};
CGContextClearRect(bar->context, draw_region); CGContextClearRect(bar->context, draw_region);
CGContextSetRGBFillColor(bar->context, bar_item->icon_color.r, bar_item->icon_color.g, bar_item->icon_color.b, bar_item->icon_color.a); CGContextSetRGBFillColor(bar->context, bar_item->background_color.r, bar_item->background_color.g, bar_item->background_color.b, bar_item->background_color.a);
CGMutablePathRef path = CGPathCreateMutable(); CGMutablePathRef path = CGPathCreateMutable();
CGPathAddRect(path, NULL, draw_region); CGPathAddRect(path, NULL, draw_region);
@ -261,7 +261,7 @@ void bar_refresh(struct bar* bar) {
bar_item_set_bounding_rect_for_space(bar_item, sid, bar->origin); bar_item_set_bounding_rect_for_space(bar_item, sid, bar->origin);
// Actual drawing // Actual drawing
//bar_draw_item_background(bar, bar_item, sid); bar_draw_item_background(bar, bar_item, sid);
bar_draw_line(bar, *icon, icon_position.x, icon_position.y); bar_draw_line(bar, *icon, icon_position.x, icon_position.y);
bar_draw_line(bar, *label, label_position.x, label_position.y); bar_draw_line(bar, *label, label_position.x, label_position.y);
bar_draw_graph(bar, bar_item, graph_x, graph_rtl); bar_draw_graph(bar, bar_item, graph_x, graph_rtl);

1
src/bar_item.c
View file

@ -40,6 +40,7 @@ void bar_item_init(struct bar_item* bar_item, struct bar_item* default_item) {
bar_item->label_highlight_color = rgba_color_from_hex(0xffffffff); bar_item->label_highlight_color = rgba_color_from_hex(0xffffffff);
bar_item->has_graph = false; bar_item->has_graph = false;
bar_item->num_rects = 0; bar_item->num_rects = 0;
bar_item->background_color = rgba_color_from_hex(0x44ff0000);
bar_item->bounding_rects = NULL; bar_item->bounding_rects = NULL;
if (default_item) { if (default_item) {

3
src/bar_item.h
View file

@ -37,6 +37,9 @@ struct bar_item {
// The position in the bar: l,r,c // The position in the bar: l,r,c
char position; char position;
// Background
struct rgba_color background_color;
// Icon properties // Icon properties
bool icon_highlight; bool icon_highlight;
struct bar_line icon_line; struct bar_line icon_line;