From 15fcdb0ca58cd5b48fdd8a0b0ab5a6c9d92d0be4 Mon Sep 17 00:00:00 2001 From: speedie Date: Sun, 16 Jul 2023 03:46:31 +0200 Subject: [PATCH] Don't merge the right powerline with the next item --- libs/draw.c | 2 +- spmenu.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/draw.c b/libs/draw.c index 6c6f5da..854e723 100644 --- a/libs/draw.c +++ b/libs/draw.c @@ -335,7 +335,7 @@ int drawitem(int x, int y, int w) { int itemoverride = 1; for (item = currentitem; item != nextitem; item = item->right) { // draw items - x = drawitemtext(item, x + (powerlineitems ? sp.plw : 0), y, MIN(pango_item ? TEXTWM(item->text) : TEXTW(item->text), + x = drawitemtext(item, x + (powerlineitems ? 2 * sp.plw : 0), y, MIN(pango_item ? TEXTWM(item->text) : TEXTW(item->text), sp.mw - x - rarroww - numberw - diff --git a/spmenu.c b/spmenu.c index 48a74b4..7379c33 100644 --- a/spmenu.c +++ b/spmenu.c @@ -384,13 +384,13 @@ void calcoffsets(void) { // calculate which items will begin the next page for (i = 0, nextitem = currentitem; nextitem; nextitem = nextitem->right) { - if ((i += (lines > 0) ? sp.bh : MIN(TEXTWM(nextitem->text) + (powerlineitems ? !lines ? 2 * sp.plw : 0 : 0), offset)) > offset) + if ((i += (lines > 0) ? sp.bh : MIN(TEXTWM(nextitem->text) + (powerlineitems ? !lines ? 3 * sp.plw : 0 : 0), offset)) > offset) break; } // calculate which items will begin the previous page for (i = 0, previousitem = currentitem; previousitem && previousitem->left; previousitem = previousitem->left) { - if ((i += (lines > 0) ? sp.bh : MIN(TEXTWM(previousitem->left->text) + (powerlineitems ? !lines ? 2 * sp.plw : 0 : 0), offset)) > offset) + if ((i += (lines > 0) ? sp.bh : MIN(TEXTWM(previousitem->left->text) + (powerlineitems ? !lines ? 3 * sp.plw : 0 : 0), offset)) > offset) break; } }