Commit Diff

Commit:
657122f7819fd74d66706ffb607deb44884401b7
From:
Quentin Rameau <quinq@fifth.space>
Via:
Hiltjo Posthuma <hiltjo@codemadness.org>
Date:
Message:
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.
Actions:
Patch | Tree
commit - 3c91eed0fb74657c3fa25bc4fd65cd0aa88464c0
commit + 657122f7819fd74d66706ffb607deb44884401b7
blob - e926ecac26ec61f67f1add2e7ed12a6789f3ca50
blob + 8e84fbdf9afb6e572d2cae240d0d2801851c1765
--- dmenu.c
+++ 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;
 }