Xinqi Bao's Git

projects / dmenu.git / commitdiff
summary | log | commit | diff | tree
raw | patch | inline | side by side (from parent 1: b81c1e8)
fixed width bug
authorConnor Lane Smith <[email protected]>
Fri, 20 Aug 2010 18:42:58 +0000 (19:42 +0100)
committerConnor Lane Smith <[email protected]>
Fri, 20 Aug 2010 18:42:58 +0000 (19:42 +0100)
dmenu.c patch | blob | history

diff --git a/dmenu.c b/dmenu.c
index 2596b56..5ae611f 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -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)
                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)
                        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;
 }
 
                        break;
 }
 
@@ -124,7 +124,7 @@ drawmenu(void) {
                        dc_drawtext(dc, "<", normcol);
                for(item = curr; item != next; item = item->right) {
                        dc->x += dc->w;
                        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, ">");
                        dc_drawtext(dc, item->text, (item == sel) ? selcol : normcol);
                }
                dc->w = dc_textw(dc, ">");