aw/dmenu
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed width bug

Browse Source
This commit is contained in:
Connor Lane Smith 2010-08-20 19:42:58 +01:00
parent b81c1e88cd
commit a5f31f5707
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dmenu.c
View File

@ -83,10 +83,10 @@ calcoffsets(void) {
n = mw - (promptw + inputw + dc_textw(dc, "<") + dc_textw(dc, ">")); n = mw - (promptw + inputw + dc_textw(dc, "<") + dc_textw(dc, ">"));
for(i = 0, next = curr; next; next = next->right) for(i = 0, next = curr; next; next = next->right)
if((i += (lines > 0) ? bh : dc_textw(dc, next->text)) > n) if((i += (lines > 0) ? bh : MIN(dc_textw(dc, next->text), n)) > n)
break; break;
for(i = 0, prev = curr; prev && prev->left; prev = prev->left) for(i = 0, prev = curr; prev && prev->left; prev = prev->left)
if((i += (lines > 0) ? bh : dc_textw(dc, prev->left->text)) > n) if((i += (lines > 0) ? bh : MIN(dc_textw(dc, prev->left->text), n)) > n)
break; break;
} }
@ -124,7 +124,7 @@ drawmenu(void) {
dc_drawtext(dc, "<", normcol); dc_drawtext(dc, "<", normcol);
for(item = curr; item != next; item = item->right) { for(item = curr; item != next; item = item->right) {
dc->x += dc->w; dc->x += dc->w;
dc->w = dc_textw(dc, item->text); dc->w = MIN(dc_textw(dc, item->text), mw - dc->x);
dc_drawtext(dc, item->text, (item == sel) ? selcol : normcol); dc_drawtext(dc, item->text, (item == sel) ? selcol : normcol);
} }
dc->w = dc_textw(dc, ">"); dc->w = dc_textw(dc, ">");