Horizontal padding is now inside the border too
This commit is contained in:
parent
c8575e1f91
commit
bc31a638f6
8
x.c
8
x.c
@ -455,10 +455,10 @@ static dimension_t x_render_layout(cairo_t *c, colored_layout *cl, dimension_t d
|
|||||||
|
|
||||||
dim.y += settings.padding;
|
dim.y += settings.padding;
|
||||||
if (cl->icon && settings.icon_position == icons_left) {
|
if (cl->icon && settings.icon_position == icons_left) {
|
||||||
cairo_move_to(c, cairo_image_surface_get_width(cl->icon) + 2 * settings.h_padding, bg_y + settings.padding + h/2 - h_text/2);
|
cairo_move_to(c, settings.frame_width + cairo_image_surface_get_width(cl->icon) + 2 * settings.h_padding, bg_y + settings.padding + h/2 - h_text/2);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
cairo_move_to(c, settings.h_padding, bg_y + settings.padding);
|
cairo_move_to(c, settings.frame_width + settings.h_padding, bg_y + settings.padding);
|
||||||
}
|
}
|
||||||
cairo_set_source_rgb(c, cl->fg.r, cl->fg.g, cl->fg.b);
|
cairo_set_source_rgb(c, cl->fg.r, cl->fg.g, cl->fg.b);
|
||||||
pango_cairo_update_layout(c, cl->l);
|
pango_cairo_update_layout(c, cl->l);
|
||||||
@ -483,8 +483,8 @@ static dimension_t x_render_layout(cairo_t *c, colored_layout *cl, dimension_t d
|
|||||||
image_x,
|
image_x,
|
||||||
image_y = bg_y + settings.padding;
|
image_y = bg_y + settings.padding;
|
||||||
|
|
||||||
if (settings.icon_position == icons_left) image_x = settings.h_padding;
|
if (settings.icon_position == icons_left) image_x = settings.frame_width + settings.h_padding;
|
||||||
else image_x = bg_width - settings.h_padding - image_width;
|
else image_x = bg_width - settings.h_padding - image_width + settings.frame_width;
|
||||||
|
|
||||||
cairo_set_source_surface (c, cl->icon, image_x, image_y);
|
cairo_set_source_surface (c, cl->icon, image_x, image_y);
|
||||||
cairo_rectangle (c, image_x, image_y, image_width, image_height);
|
cairo_rectangle (c, image_x, image_y, image_width, image_height);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user