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

fix: Calculate position of batt_line based on clock format

Browse source
This commit is contained in:
cmacrae 2020-07-08 21:01:43 +01:00
parent 8b015b9247
commit 146f0d45f1
No known key found for this signature in database
GPG key ID: 53922D7E54A14F5D
1 changed files with 51 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

114
src/bar.c
View file

@ -262,95 +262,83 @@ void bar_refresh(struct bar *bar)
int initial_bar_right_x = bar->frame.size.width - 10;
time_t rawtime;
time(&rawtime);
float time_line_width = 0;
int time_line_pos;
struct tm *timeinfo = localtime(&rawtime);
if (timeinfo) {
char time[255];
strftime(time, sizeof(time), g_bar_manager._clock_format, timeinfo);
//snprintf(time, sizeof(time), "%02d:%02d", timeinfo->tm_hour, timeinfo->tm_min);
struct bar_line time_line = bar_prepare_line(g_bar_manager.t_font, time, g_bar_manager.foreground_color);
CGPoint t_pos = bar_align_line(bar, time_line, ALIGN_RIGHT, ALIGN_CENTER);
bar_draw_line(bar, time_line, t_pos.x, t_pos.y);
char time[255];
strftime(time, sizeof(time), g_bar_manager._clock_format, timeinfo);
struct bar_line time_line = bar_prepare_line(g_bar_manager.t_font, time, g_bar_manager.foreground_color);
CGPoint t_pos = bar_align_line(bar, time_line, ALIGN_RIGHT, ALIGN_CENTER);
bar_draw_line(bar, time_line, t_pos.x, t_pos.y);
CGPoint ti_pos = bar_align_line(bar, g_bar_manager.clock_icon, 0, ALIGN_CENTER);
ti_pos.x = t_pos.x - g_bar_manager.clock_icon.bounds.size.width - 5;
CGPoint ti_pos = bar_align_line(bar, g_bar_manager.clock_icon, 0, ALIGN_CENTER);
ti_pos.x = t_pos.x - g_bar_manager.clock_icon.bounds.size.width - 5;
time_line_pos = ti_pos.x;
CGPoint tu_pos = bar_align_line(bar, g_bar_manager.clock_underline, 0, ALIGN_BOTTOM);
tu_pos.x = tu_pos.x - g_bar_manager.clock_underline.bounds.size.width / 2 - time_line.bounds.size.width / 2 - (g_bar_manager.clock_icon.bounds.size.width + 5) / 2;
bar_draw_line(bar, g_bar_manager.clock_icon, ti_pos.x, ti_pos.y);
bar_draw_line(bar, g_bar_manager.clock_underline, tu_pos.x, tu_pos.y);
bar_destroy_line(time_line);
initial_bar_right_x = tu_pos.x - 10;
bar_draw_line(bar, g_bar_manager.clock_icon, ti_pos.x, ti_pos.y);
bar_destroy_line(time_line);
}
bool has_batt = false;
bool charging = false;
int percent = bar_find_battery_life(&has_batt, &charging);
if (has_batt) {
char batt[255];
snprintf(batt, sizeof(batt), "%' '3d%%", percent);
char batt[255];
snprintf(batt, sizeof(batt), "%' '3d%%", percent);
struct bar_line batt_line = bar_prepare_line(g_bar_manager.t_font, batt, g_bar_manager.foreground_color);
CGPoint p_pos = bar_align_line(bar, batt_line, ALIGN_RIGHT, ALIGN_CENTER);
p_pos.x = p_pos.x - time_line_width - g_bar_manager.clock_underline.bounds.size.width - 20;
bar_draw_line(bar, batt_line, p_pos.x, p_pos.y);
struct bar_line batt_line = bar_prepare_line(g_bar_manager.t_font, batt, g_bar_manager.foreground_color);
CGPoint p_pos = bar_align_line(bar, batt_line, ALIGN_RIGHT, ALIGN_CENTER);
p_pos.x = time_line_pos - 40;
bar_draw_line(bar, batt_line, p_pos.x, p_pos.y);
struct bar_line batt_icon = charging ? g_bar_manager.power_icon : g_bar_manager.battr_icon;
CGPoint pi_pos = bar_align_line(bar, batt_icon, 0, ALIGN_CENTER);
pi_pos.x = p_pos.x - batt_icon.bounds.size.width - 5;
struct bar_line batt_icon = charging ? g_bar_manager.power_icon : g_bar_manager.battr_icon;
CGPoint pi_pos = bar_align_line(bar, batt_icon, 0, ALIGN_CENTER);
pi_pos.x = p_pos.x - batt_icon.bounds.size.width;
CGPoint pu_pos = bar_align_line(bar, g_bar_manager.power_underline, 0, ALIGN_BOTTOM);
pu_pos.x = pu_pos.x - g_bar_manager.power_underline.bounds.size.width / 2 - batt_line.bounds.size.width / 2 - (batt_icon.bounds.size.width + 5) / 2;
bar_draw_line(bar, batt_icon, pi_pos.x, pi_pos.y);
bar_draw_line(bar, g_bar_manager.power_underline, pu_pos.x, pu_pos.y);
bar_destroy_line(batt_line);
initial_bar_right_x = pu_pos.x - 10;
bar_draw_line(bar, batt_icon, pi_pos.x, pi_pos.y);
bar_destroy_line(batt_line);
}
// BAR CENTER
char *title = focused_window_title();
if (title) {
int overlap_left = 0;
int overlap_right = 0;
int overlap_left = 0;
int overlap_right = 0;
struct bar_line title_line = bar_prepare_line(g_bar_manager.t_font, title, g_bar_manager.foreground_color);
CGPoint pos = bar_align_line(bar, title_line, ALIGN_CENTER, ALIGN_CENTER);
struct bar_line title_line = bar_prepare_line(g_bar_manager.t_font, title, g_bar_manager.foreground_color);
CGPoint pos = bar_align_line(bar, title_line, ALIGN_CENTER, ALIGN_CENTER);
if (final_bar_left_x >= pos.x) {
overlap_left = final_bar_left_x - pos.x;
}
if (final_bar_left_x >= pos.x) {
overlap_left = final_bar_left_x - pos.x;
}
assert(overlap_left >= 0);
assert(overlap_left >= 0);
if (overlap_left > 0) {
pos.x = final_bar_left_x;
}
if (overlap_left > 0) {
pos.x = final_bar_left_x;
}
if (initial_bar_right_x <= pos.x + title_line.bounds.size.width) {
overlap_right = pos.x + title_line.bounds.size.width - initial_bar_right_x;
}
if (initial_bar_right_x <= pos.x + title_line.bounds.size.width) {
overlap_right = pos.x + title_line.bounds.size.width - initial_bar_right_x;
}
assert(overlap_right >= 0);
assert(overlap_right >= 0);
if (overlap_right > 0) {
int truncated_width = (int)title_line.bounds.size.width - overlap_right;
if (truncated_width > 0) {
CTLineRef truncated_line = CTLineCreateTruncatedLine(title_line.line, truncated_width, kCTLineTruncationEnd, NULL);
CFRelease(title_line.line);
title_line.line = truncated_line;
} else {
goto free_title;
}
}
if (overlap_right > 0) {
int truncated_width = (int)title_line.bounds.size.width - overlap_right;
if (truncated_width > 0) {
CTLineRef truncated_line = CTLineCreateTruncatedLine(title_line.line, truncated_width, kCTLineTruncationEnd, NULL);
CFRelease(title_line.line);
title_line.line = truncated_line;
} else {
goto free_title;
}
}
bar_draw_line(bar, title_line, pos.x, pos.y);
free_title:
bar_destroy_line(title_line);
free(title);
bar_draw_line(bar, title_line, pos.x, pos.y);
free_title:
bar_destroy_line(title_line);
free(title);
}
CGContextFlush(bar->context);