diff options
author | Connor Lane Smith <cls@lubutu.com> | 2010-08-20 19:42:58 +0100 |
---|---|---|
committer | Connor Lane Smith <cls@lubutu.com> | 2010-08-20 19:42:58 +0100 |
commit | a5f31f570774ca1d4a504d8c13c96af0217635a7 (patch) | |
tree | 05aaa9eb19877c6974192691ca603a186e48c1a7 | |
parent | b81c1e88cdf637e184c5733c87a728df8471fe4e (diff) | |
download | dmenu-a5f31f570774ca1d4a504d8c13c96af0217635a7.tar.gz dmenu-a5f31f570774ca1d4a504d8c13c96af0217635a7.tar.bz2 dmenu-a5f31f570774ca1d4a504d8c13c96af0217635a7.zip |
fixed width bug
-rw-r--r-- | dmenu.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -83,10 +83,10 @@ calcoffsets(void) { n = mw - (promptw + inputw + dc_textw(dc, "<") + dc_textw(dc, ">")); 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; 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; } @@ -124,7 +124,7 @@ drawmenu(void) { dc_drawtext(dc, "<", normcol); for(item = curr; item != next; item = item->right) { 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->w = dc_textw(dc, ">"); |