mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-24 06:46:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't render a icon if the window does not provide one

Browse source 
Signed-off-by: Felix Weilbach <felix.weilbach@t-online.de>
This commit is contained in:
Felix Weilbach 2021-04-30 21:28:22 +02:00
parent 8fa71290af
commit 89b97c5346
1 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
swaybar/render.c
View file

@ -158,9 +158,10 @@ static uint32_t render_focused_window_title(struct render_context *ctx, double *
return ideal_surface_height; return ideal_surface_height;
} }
/* *x += margin; */
uint32_t height = output->height * output->scale; uint32_t height = output->height * output->scale;
double text_y = height / 2.0 - text_height / 2.0; double text_y = height / 2.0 - text_height / 2.0;
int padding = 4;
*x += padding;
cairo_move_to(cairo, *x, (int)floor(text_y)); cairo_move_to(cairo, *x, (int)floor(text_y));
choose_text_aa_mode(ctx, fontcolor); choose_text_aa_mode(ctx, fontcolor);
pango_printf_ellipsize(cairo, config->font, output->scale, pango_printf_ellipsize(cairo, config->font, output->scale,
@ -768,13 +769,8 @@ uint32_t render_focused_window_icon(cairo_t *cairo,
&min_size, &min_size,
&max_size); &max_size);
icon = load_background_image(icon_path); icon = load_background_image(icon_path);
} else {
// TODO: Generate a image on the fly
icon = load_background_image(
"/usr/share/icons/Adwaita/16x16/apps/"
"utilities-terminal-symbolic.symbolic.png");
} }
assert(icon);
if (!icon) { if (!icon) {
return output->height; return output->height;
} }
@ -785,7 +781,7 @@ uint32_t render_focused_window_icon(cairo_t *cairo,
actual_size*(target_size/actual_size) : target_size; actual_size*(target_size/actual_size) : target_size;
icon = cairo_image_surface_scale(icon, icon_size, icon_size); icon = cairo_image_surface_scale(icon, icon_size, icon_size);
int padded_size = icon_size + 2 * padding; int padded_size = icon_size + padding;
int y = floor((height - padded_size) / 2.0); int y = floor((height - padded_size) / 2.0);
cairo_operator_t op = cairo_get_operator(cairo); cairo_operator_t op = cairo_get_operator(cairo);