diff options
| author | okan <okan> | 2015-07-01 14:36:42 +0000 |
|---|---|---|
| committer | okan <okan> | 2015-07-01 14:36:42 +0000 |
| commit | cb900def7f4da5216d567a27a04429d3dac85ae8 (patch) | |
| tree | d9618c290a87ca3ee7ee33412e8cfb3e57ca9dce /menu.c | |
| parent | 8efaf33cfbced84ff073f5c4d3b2c8e9d7b3bff4 (diff) | |
| download | cwm-cb900def7f4da5216d567a27a04429d3dac85ae8.tar.gz cwm-cb900def7f4da5216d567a27a04429d3dac85ae8.tar.xz cwm-cb900def7f4da5216d567a27a04429d3dac85ae8.zip | |
style
Diffstat (limited to 'menu.c')
| -rw-r--r-- | menu.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/menu.c b/menu.c index 0151ecf..15d2b7d 100644 --- a/menu.c +++ b/menu.c @@ -411,8 +411,7 @@ menu_draw(struct menu_ctx *mc, struct menu_q *menuq, struct menu_q *resultq) n = 0; TAILQ_FOREACH(mi, resultq, resultentry) { - char *text = mi->print[0] != '\0' ? - mi->print : mi->text; + char *text = (mi->print[0] != '\0') ? mi->print : mi->text; int y = n * (sc->xftfont->height + 1) + sc->xftfont->ascent + 1; /* Stop drawing when menu doesn't fit inside the screen. */ @@ -444,12 +443,12 @@ menu_draw_entry(struct menu_ctx *mc, struct menu_q *resultq, if (mi == NULL) return; - color = active ? CWM_COLOR_MENU_FG : CWM_COLOR_MENU_BG; - text = mi->print[0] != '\0' ? mi->print : mi->text; + color = (active) ? CWM_COLOR_MENU_FG : CWM_COLOR_MENU_BG; + text = (mi->print[0] != '\0') ? mi->print : mi->text; XftDrawRect(sc->xftdraw, &sc->xftcolor[color], 0, (sc->xftfont->height + 1) * entry, mc->geom.w, (sc->xftfont->height + 1) + sc->xftfont->descent); - color = active ? CWM_COLOR_MENU_FONT_SEL : CWM_COLOR_MENU_FONT; + color = (active) ? CWM_COLOR_MENU_FONT_SEL : CWM_COLOR_MENU_FONT; xu_xft_draw(sc, text, color, 0, (sc->xftfont->height + 1) * entry + sc->xftfont->ascent + 1); } |