From fe32c034fabe9f4f74b78c64350171041bca89c8 Mon Sep 17 00:00:00 2001 From: kj Date: Fri, 24 Mar 2017 10:17:35 +0900 Subject: [PATCH] Add text offset size --- include/yabar.h | 1 + src/ya_draw.c | 2 +- src/ya_parse.c | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/yabar.h b/include/yabar.h index a6889cd..082a4c4 100644 --- a/include/yabar.h +++ b/include/yabar.h @@ -277,6 +277,7 @@ struct ya_bar { uint8_t ulsize; //underline size uint8_t olsize; //overline size + uint8_t oosize; //offset size uint8_t slack; //slack size uint32_t brcolor; //border color diff --git a/src/ya_draw.c b/src/ya_draw.c index 156cc8c..d0fc0ef 100644 --- a/src/ya_draw.c +++ b/src/ya_draw.c @@ -728,7 +728,7 @@ void ya_draw_pango_text(struct ya_block *blk) { pango_layout_set_width(layout, blk->width * PANGO_SCALE); pango_layout_set_wrap(layout, PANGO_WRAP_WORD); pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END); - int offset = (blk->bar->height - ht)/2; + int offset = (blk->bar->height - ht)/2 + blk->bar->oosize; cairo_move_to(cr, 0, offset); pango_cairo_show_layout(cr, layout); cairo_move_to(cr, 0, offset); diff --git a/src/ya_parse.c b/src/ya_parse.c index aae5658..0b0b91a 100644 --- a/src/ya_parse.c +++ b/src/ya_parse.c @@ -59,6 +59,7 @@ static void ya_copy_bar_members(ya_bar_t *dstb, ya_bar_t *srcb) { dstb->desc = srcb->desc; dstb->ulsize = srcb->ulsize; dstb->olsize = srcb->olsize; + dstb->oosize = srcb->oosize; dstb->slack = srcb->slack; dstb->brcolor = srcb->brcolor; dstb->brsize = srcb->brsize; @@ -312,6 +313,10 @@ static void ya_setup_bar(config_setting_t * set) { if(retcnf == CONFIG_TRUE) { bar->olsize = retint; } + retcnf = config_setting_lookup_int(set, "offset-size", &retint); + if(retcnf == CONFIG_TRUE) { + bar->oosize = retint; + } retcnf = config_setting_lookup_int(set, "background-color-argb", &retint); if(retcnf == CONFIG_FALSE) { if(NOT_INHERIT_BAR(bar))