Lucas-mother3/spmenu
1
0
Fork 0
forked from speedie/spmenu
Code Pull requests Activity

some more minor changes to the drawing funcs

Browse source
This commit is contained in:
speedie 2023-04-05 20:54:37 +02:00
parent dcd006ae2b
commit 087a405ada
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libs/draw.c
View file

@ -228,13 +228,13 @@ drawitem(int x, int y, int w)
x += inputw; x += inputw;
w = larrowWidth; w = larrowWidth;
x = drawlarrow(x, 0, w); x = drawlarrow(x, y, w);
for (item = curr; item != next; item = item->right) // draw items for (item = curr; item != next; item = item->right) // draw items
x = drawitemtext(item, x, 0, MIN(pango_item ? TEXTWM(item->text) : TEXTW(item->text), mw - x - rarrowWidth - numberWidth - modeWidth)); x = drawitemtext(item, x, y, MIN(pango_item ? TEXTWM(item->text) : TEXTW(item->text), mw - x - rarrowWidth - numberWidth - modeWidth));
w = rarrowWidth + numberWidth + modeWidth; w = rarrowWidth + numberWidth + modeWidth;
x = drawrarrow(mw - w, 0, w); x = drawrarrow(mw - w, y, w);
} }
return x; return x;
@ -250,7 +250,7 @@ drawprompt(int x, int y, int w)
if (!hidepowerline) { if (!hidepowerline) {
drw_settrans(drw, scheme[SchemePrompt], scheme[SchemeMenu]); drw_settrans(drw, scheme[SchemePrompt], scheme[SchemeMenu]);
drw_arrow(drw, x, 0, plw, bh, 1, 0); drw_arrow(drw, x, y, plw, bh, 1, 0);
x += plw; x += plw;
} }
@ -283,7 +283,7 @@ drawinput(int x, int y, int w)
free(censort); free(censort);
} else if (!passwd && !hideprompt) { } else if (!passwd && !hideprompt) {
apply_fribidi(text); apply_fribidi(text);
drw_text(drw, x, 0, w, bh, lrpad / 2, isrtl ? fribidi_text : text, 0, pango_input ? True : False); drw_text(drw, x, y, w, bh, lrpad / 2, isrtl ? fribidi_text : text, 0, pango_input ? True : False);
curpos = TEXTW(text) - TEXTW(&text[cursor]); curpos = TEXTW(text) - TEXTW(&text[cursor]);
} }
@ -409,11 +409,11 @@ drawmenu(void)
if (!hideprompt) { if (!hideprompt) {
w = promptw; w = promptw;
x = drawprompt(x, 0, w); x = drawprompt(x, y, w);
} }
if (!hideinput) { if (!hideinput) {
w = (lines > 0 || !matches) ? mw - x : inputw; w = (lines > 0 || !matches) ? mw - x : inputw;
x = drawinput(x, 0, w); x = drawinput(x, y, w);
} }
@ -425,12 +425,12 @@ drawmenu(void)
if (!hidematchcount) { if (!hidematchcount) {
w = numberWidth; w = numberWidth;
drawnumber(mw - numberWidth - modeWidth - 2 * sp - 2 * borderwidth, 0, w); drawnumber(mw - numberWidth - modeWidth - 2 * sp - 2 * borderwidth, y, w);
} }
if (!hidemode) { if (!hidemode) {
w = modeWidth; w = modeWidth;
drawmode(mw - modeWidth - 2 * sp - 2 * borderwidth, 0, w); drawmode(mw - modeWidth - 2 * sp - 2 * borderwidth, y, w);
} }
drw_map(drw, win, 0, 0, mw, mh); drw_map(drw, win, 0, 0, mw, mh);