From 253e69413d9b4b5b555a2b3828464f91bb96f2a9 Mon Sep 17 00:00:00 2001 From: speedie Date: Fri, 28 Jul 2023 03:44:44 +0200 Subject: [PATCH] Fix more of last commit --- spmenu.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/spmenu.c b/spmenu.c index 6f842b2..3314cdc 100644 --- a/spmenu.c +++ b/spmenu.c @@ -470,19 +470,16 @@ void insert(const char *str, ssize_t n) { int capsw = 0; // add width - if (!hidelarrow) larroww = pango_leftarrow ? TEXTWM(leftarrow) : TEXTW(leftarrow); - if (!hiderarrow) rarroww = pango_rightarrow ? TEXTWM(rightarrow) : TEXTW(rightarrow); - if (!hidemode) modew = pango_mode ? TEXTWM(tx.modetext) : TEXTW(tx.modetext); - if (!hiderarrow) rarroww = pango_rightarrow ? TEXTWM(rightarrow) : TEXTW(rightarrow); - if (!hidematchcount) numberw = pango_numbers ? TEXTWM(tx.numbers) : TEXTW(tx.numbers); - if (!hidecaps) capsw = pango_caps ? TEXTWM(tx.capstext) : TEXTW(tx.capstext); + if (!hidelarrow) larroww = TEXTW(leftarrow); + if (!hiderarrow) rarroww = TEXTW(rightarrow); + if (!hidemode) modew = MAX(MAX(TEXTW(normtext), TEXTW(instext)), TEXTW(regextext)); + if (!hiderarrow) rarroww = TEXTW(rightarrow); + if (!hidematchcount) numberw = TEXTW(tx.numbers); + if (!hidecaps) capsw = MAX(TEXTW(capslockontext), TEXTW(capslockofftext)); - if (!strcmp(tx.capstext, "")) - capsw = 0; - - if (n + TEXTW(tx.text) >= sp.inputw && selecteditem) { + if (TEXTW(str) + TEXTW(tx.text) >= sp.inputw && selecteditem) { return; - } else if (n + TEXTW(tx.text) >= sp.mw - (sp.promptw + (!lines ? larroww : 0) + (!lines ? rarroww : 0) + modew + numberw + capsw + menumarginh)) { + } else if (TEXTW(str) + TEXTW(tx.text) >= sp.mw - (sp.promptw + (!lines ? larroww : 0) + (!lines ? rarroww : 0) + modew + numberw + capsw + menumarginh)) { return; }