aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConnor Lane Smith <cls@lubutu.com>2010-08-20 19:42:58 +0100
committerConnor Lane Smith <cls@lubutu.com>2010-08-20 19:42:58 +0100
commita5f31f570774ca1d4a504d8c13c96af0217635a7 (patch)
tree05aaa9eb19877c6974192691ca603a186e48c1a7
parentb81c1e88cdf637e184c5733c87a728df8471fe4e (diff)
fixed width bug
-rw-r--r--dmenu.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/dmenu.c b/dmenu.c
index 2596b56..5ae611f 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -83,10 +83,10 @@ calcoffsets(void) {
83 n = mw - (promptw + inputw + dc_textw(dc, "<") + dc_textw(dc, ">")); 83 n = mw - (promptw + inputw + dc_textw(dc, "<") + dc_textw(dc, ">"));
84 84
85 for(i = 0, next = curr; next; next = next->right) 85 for(i = 0, next = curr; next; next = next->right)
86 if((i += (lines > 0) ? bh : dc_textw(dc, next->text)) > n) 86 if((i += (lines > 0) ? bh : MIN(dc_textw(dc, next->text), n)) > n)
87 break; 87 break;
88 for(i = 0, prev = curr; prev && prev->left; prev = prev->left) 88 for(i = 0, prev = curr; prev && prev->left; prev = prev->left)
89 if((i += (lines > 0) ? bh : dc_textw(dc, prev->left->text)) > n) 89 if((i += (lines > 0) ? bh : MIN(dc_textw(dc, prev->left->text), n)) > n)
90 break; 90 break;
91} 91}
92 92
@@ -124,7 +124,7 @@ drawmenu(void) {
124 dc_drawtext(dc, "<", normcol); 124 dc_drawtext(dc, "<", normcol);
125 for(item = curr; item != next; item = item->right) { 125 for(item = curr; item != next; item = item->right) {
126 dc->x += dc->w; 126 dc->x += dc->w;
127 dc->w = dc_textw(dc, item->text); 127 dc->w = MIN(dc_textw(dc, item->text), mw - dc->x);
128 dc_drawtext(dc, item->text, (item == sel) ? selcol : normcol); 128 dc_drawtext(dc, item->text, (item == sel) ? selcol : normcol);
129 } 129 }
130 dc->w = dc_textw(dc, ">"); 130 dc->w = dc_textw(dc, ">");