[hackers] [dmenu] Partially revert 44c7de3: fix items text width offset calculation || Quentin Rameau

From: <git_AT_suckless.org>
Date: Mon, 25 Jul 2016 19:59:32 +0200 (CEST)

commit 657122f7819fd74d66706ffb607deb44884401b7
Author: Quentin Rameau <quinq_AT_fifth.space>
AuthorDate: Mon Jul 25 11:33:25 2016 +0200
Commit: Hiltjo Posthuma <hiltjo_AT_codemadness.org>
CommitDate: Mon Jul 25 19:57:31 2016 +0200

    Partially revert 44c7de3: fix items text width offset calculation
    
    Without this, we discard the item if it's longer than assigned width
    instead of truncating it.

diff --git a/dmenu.c b/dmenu.c
index e926eca..8e84fbd 100644
--- a/dmenu.c
+++ b/dmenu.c
_AT_@ -81,10 +81,10 @@ calcoffsets(void)
                 n = mw - (promptw + inputw + TEXTW("<") + TEXTW(">"));
         /* calculate which items will begin the next page and previous page */
         for (i = 0, next = curr; next; next = next->right)
- if ((i += (lines > 0) ? bh : TEXTW(next->text)) > n)
+ if ((i += (lines > 0) ? bh : MIN(TEXTW(next->text), n)) > n)
                         break;
         for (i = 0, prev = curr; prev && prev->left; prev = prev->left)
- if ((i += (lines > 0) ? bh : TEXTW(prev->left->text)) > n)
+ if ((i += (lines > 0) ? bh : MIN(TEXTW(prev->left->text), n)) > n)
                         break;
 }
 
Received on Mon Jul 25 2016 - 19:59:32 CEST