hiro/yabar
1
0
Fork 0
mirror of https://github.com/vale981/yabar synced 2025-03-05 09:31:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added support for width

Browse source
This commit is contained in:
Linden Krouse 2016-03-14 23:11:46 -04:00
parent 53ad261911
commit 6525f83dd0
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/ya_draw.c
View file

@ -26,19 +26,19 @@ void ya_create_block(ya_block_t *blk) {
tmpblk = blk->bar->curblk[A_CENTER];
if(tmpblk) {
for(;tmpblk->prev_blk; tmpblk = tmpblk->prev_blk);
tmpblk->xpos = (ya.scr->width_in_pixels - blk->bar->occupied_width[A_CENTER] - 2*blk->bar->hgap)/2;
tmpblk->xpos = (blk->bar->width - blk->bar->occupied_width[A_CENTER])/2;
for(tmpblk = tmpblk->next_blk; tmpblk; tmpblk = tmpblk->next_blk) {
tmpblk->xpos = tmpblk->prev_blk->xpos + tmpblk->prev_blk->width + blk->bar->slack;
}
}
else {
blk->xpos = (ya.scr->width_in_pixels - blk->bar->occupied_width[A_CENTER] - 2*blk->bar->hgap)/2;
blk->xpos = (blk->bar->width - blk->bar->occupied_width[A_CENTER])/2;
}
break;
case A_RIGHT:
tmpblk = blk->bar->curblk[A_RIGHT];
blk->bar->occupied_width[A_RIGHT] += (blk->width + blk->bar->slack);
blk->xpos = ya.scr->width_in_pixels - blk->width - 2*blk->bar->hgap;
blk->xpos = blk->bar->width - blk->width;
if(tmpblk) {
for(; tmpblk; tmpblk = tmpblk->prev_blk) {
tmpblk->xpos -= (blk->width + blk->bar->slack);
@ -62,17 +62,16 @@ void ya_create_block(ya_block_t *blk) {
}
int ya_create_bar(ya_bar_t * bar) {
bar->width = ya.scr->width_in_pixels - 2*(bar->hgap);
//bar->width = ya.scr->width_in_pixels - 2*(bar->hgap);
bar->win = xcb_generate_id(ya.c);
int x, y;
x = (ya.scr->width_in_pixels - bar->width) /2;
switch(bar->position){
case YA_TOP:{
x = bar->hgap;
y = bar->vgap;
break;
}
case YA_BOTTOM: {
x = bar->hgap;
y = ya.scr->height_in_pixels - bar->vgap - bar->height;
break;
}

9
src/ya_exec.c
View file

@ -197,6 +197,15 @@ void ya_setup_bar(config_setting_t * set) {
else {
bar->height = retint;
}
retcnf = config_setting_lookup_int(set, "width", &retint);
if(retcnf == CONFIG_FALSE) {
bar->width = ya.scr->width_in_pixels - 2*(bar->hgap);
}
else {
bar->width = retint;
//ignore hgap if width was specified
bar->hgap = 0;
}
retcnf = config_setting_lookup_int(set, "underline-size", &retint);
if(retcnf == CONFIG_TRUE) {
bar->ulsize = retint;