1
0
Fork 0

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.
This commit is contained in:
Quentin Rameau 2016-07-25 11:33:25 +02:00 committed by Hiltjo Posthuma
parent 3c91eed0fb
commit 657122f781

View file

@ -81,10 +81,10 @@ calcoffsets(void)
n = mw - (promptw + inputw + TEXTW("<") + TEXTW(">")); n = mw - (promptw + inputw + TEXTW("<") + TEXTW(">"));
/* calculate which items will begin the next page and previous page */ /* calculate which items will begin the next page and previous page */
for (i = 0, next = curr; next; next = next->right) 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; break;
for (i = 0, prev = curr; prev && prev->left; prev = prev->left) 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; break;
} }