mirrors/wmii
1
0
Fork 0
mirror of https://github.com/0intro/wmii synced 2024-11-30 01:23:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes to label sizing/alignment in liblitz (this really needs a brush->padding)

Browse Source
This commit is contained in:
Kris Maglione 2006-06-27 20:59:09 -04:00
parent 4113e8eb5c
commit ab2ff71e8f
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/wm/bar.c
View File

@ -30,7 +30,6 @@ create_bar(Bar **b_link, char *name)
cext_strlcpy(b->name, name, sizeof(b->name)); cext_strlcpy(b->name, name, sizeof(b->name));
b->brush = bbrush; b->brush = bbrush;
b->brush.color = def.normcolor; b->brush.color = def.normcolor;
b->brush.align = CENTER;
for(i=b_link; *i; i=&(*i)->next) for(i=b_link; *i; i=&(*i)->next)
if(strcmp((*i)->name, name) >= 0) if(strcmp((*i)->name, name) >= 0)

11
liblitz/brush.c
View File

@ -45,9 +45,8 @@ blitz_draw_label(BlitzBrush *b, char *text)
y = b->rect.y + b->rect.height / 2 - h / 2 + b->font->ascent; y = b->rect.y + b->rect.height / 2 - h / 2 + b->font->ascent;
/* shorten text if necessary */ /* shorten text if necessary */
while (len && (w = blitz_textwidth(b->font, buf)) > b->rect.width) { while (len && (w = blitz_textwidth(b->font, buf)) > b->rect.width - h) {
buf[len - 1] = 0; buf[--len] = 0;
len--;
shortened = 1; shortened = 1;
} }
@ -63,12 +62,16 @@ blitz_draw_label(BlitzBrush *b, char *text)
if (len > 1) if (len > 1)
buf[len - 1] = '.'; buf[len - 1] = '.';
} }
/* shorten text more if necessary */
while (len && (w = blitz_textwidth(b->font, buf)) > b->rect.width - h)
buf[--len] = 0;
switch (b->align) { switch (b->align) {
case EAST: case EAST:
x = b->rect.x + b->rect.width - (h / 2 + w); x = b->rect.x + b->rect.width - (h / 2 + w);
break; break;
case CENTER: case CENTER:
x = b->rect.x + (b->rect.width - w) / 2; x = b->rect.x + h / 2 + (b->rect.width - h - w) / 2;
break; break;
default: default:
x = b->rect.x + h / 2; x = b->rect.x + h / 2;