From: Quentin Rameau <quinq@fifth.space>
Date: Mon, 25 Jul 2016 09:33:25 +0000 (+0200)
Subject: Partially revert 44c7de3: fix items text width offset calculation
X-Git-Url: https://git.danieliu.xyz/?p=dmenu.git;a=commitdiff_plain;h=657122f7819fd74d66706ffb607deb44884401b7

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
@@ -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;
 }