diff options
| author | okan <okan> | 2013-01-02 02:19:20 +0000 |
|---|---|---|
| committer | okan <okan> | 2013-01-02 02:19:20 +0000 |
| commit | e492ed8e4138b3552349c314d45f2514ad3e62d5 (patch) | |
| tree | 7096b166ec4dc8cd3e86e47f78236a33458b406a /menu.c | |
| parent | 2d28b71a1b0253b4b0d58019b8c15bf4631e7914 (diff) | |
| download | cwm-e492ed8e4138b3552349c314d45f2514ad3e62d5.tar.gz cwm-e492ed8e4138b3552349c314d45f2514ad3e62d5.tar.xz cwm-e492ed8e4138b3552349c314d45f2514ad3e62d5.zip | |
more variable consistency
Diffstat (limited to 'menu.c')
| -rw-r--r-- | menu.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/menu.c b/menu.c index 3889d96..c5ceea9 100644 --- a/menu.c +++ b/menu.c @@ -351,7 +351,7 @@ menu_draw(struct screen_ctx *sc, struct menu_ctx *mc, struct menu_q *menuq, { struct menu *mi; XineramaScreenInfo *xine; - int xmin, xmax, ymin, ymax; + int x_org, y_org, xmax, ymax; int n, xsave, ysave; if (mc->list) { @@ -396,12 +396,12 @@ menu_draw(struct screen_ctx *sc, struct menu_ctx *mc, struct menu_q *menuq, xine = screen_find_xinerama(sc, mc->x, mc->y); if (xine) { - xmin = xine->x_org; + x_org = xine->x_org; + y_org = xine->y_org; xmax = xine->x_org + xine->width; - ymin = xine->y_org; ymax = xine->y_org + xine->height; } else { - xmin = ymin = 0; + x_org = y_org = 0; xmax = sc->view.w; ymax = sc->view.h; } @@ -412,15 +412,15 @@ menu_draw(struct screen_ctx *sc, struct menu_ctx *mc, struct menu_q *menuq, /* Never hide the top, or left side, of the menu. */ if (mc->x + mc->width >= xmax) mc->x = xmax - mc->width; - if (mc->x < xmin) { - mc->x = xmin; - mc->width = xmax - xmin; + if (mc->x < x_org) { + mc->x = x_org; + mc->width = xmax - x_org; } if (mc->y + mc->height >= ymax) mc->y = ymax - mc->height; - if (mc->y < ymin) { - mc->y = ymin; - mc->height = ymax - ymin; + if (mc->y < y_org) { + mc->y = y_org; + mc->height = ymax - y_org; } if (mc->x != xsave || mc->y != ysave) |