mirror/cwm
1
0
Fork 0
mirror of https://github.com/leahneukirchen/cwm.git synced 2023-08-10 21:13:12 +03:00
Code Issues Projects Releases Wiki Activity

- let callers of font_draw figure out (and pass) the color instead of an

Browse Source 
'active' flag.
- use strlen() inside of font_draw; the only instance where it wasn't
  used happened to be ignored on a subsequent draw.
This commit is contained in:
okan
2013-05-14 12:35:56 +00:00
parent 112f616d1d
commit c637a54048
4 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
menu.c
View File

@ -419,7 +419,7 @@ menu_draw(struct screen_ctx *sc, struct menu_ctx *mc, struct menu_q *menuq,
mc->width, mc->height);
if (mc->hasprompt) {
font_draw(sc, mc->dispstr, strlen(mc->dispstr), sc->menuwin, 0,
font_draw(sc, mc->dispstr, sc->menuwin, CWM_COLOR_MENU_FONT,
0, sc->xftfont->ascent);
n = 1;
} else
@ -434,8 +434,7 @@ menu_draw(struct screen_ctx *sc, struct menu_ctx *mc, struct menu_q *menuq,
if (mc->y + y > xine.h)
break;
font_draw(sc, text, MIN(strlen(text), MENU_MAXENTRY),
sc->menuwin, 0, 0, y);
font_draw(sc, text, sc->menuwin, CWM_COLOR_MENU_FONT, 0, y);
n++;
}
if (mc->hasprompt && n > 1 && (mc->searchstr[0] != '\0')) {
@ -466,7 +465,8 @@ menu_draw_entry(struct screen_ctx *sc, struct menu_ctx *mc,
XftDrawRect(sc->xftdraw, &sc->xftcolor[color], 0,
(sc->xftfont->height + 1) * entry, mc->width,
(sc->xftfont->height + 1) + sc->xftfont->descent);
font_draw(sc, text, strlen(text), sc->menuwin, active,
color = active ? CWM_COLOR_MENU_FONT_SEL : CWM_COLOR_MENU_FONT;
font_draw(sc, text, sc->menuwin, color,
0, (sc->xftfont->height + 1) * entry + sc->xftfont->ascent + 1);
}