static void initmonitor(void);
static void initresources(void);
static void initdc(void);
-static void initconfig(void);
+static void initiconsize(void);
static void initatoms(void);
/* structure builders, and their helper routines */
initmonitor();
initresources();
initdc();
- initconfig();
+ initiconsize();
initatoms();
/* set window class */
dc.gc = XCreateGC(dpy, rootwin, 0, NULL);
}
-/* calculate configuration values that are not set manually */
+/* calculate icon size */
static void
-initconfig(void)
+initiconsize(void)
{
- config.screenw = DisplayWidth(dpy, screen);
- config.screenh = DisplayHeight(dpy, screen);
config.iconsize = config.height_pixels - config.iconpadding * 2;
}
menu->y = 0; /* calculated by setupmenu() */
menu->level = level;
menu->drawn = 0;
+ menu->hasicon = 0;
swa.override_redirect = (wflag) ? False : True;
swa.background_pixel = dc.normal[ColorBG].pixel;
curritem->prev = NULL;
}
+ if (curritem->file)
+ prevmenu->hasicon = 1;
+
return rootmenu;
}
if (draw) {
int texty;
- texty = y + (h + currfont->ascent) / 2;
+ texty = y + (h - (currfont->ascent + currfont->descent))/2 + currfont->ascent;
XftDrawStringUtf8(draw, color, currfont, x, texty,
(XftChar8 *)s, len);
x += ext.xOff;
* padding appears 3 times: before the label and around the triangle.
*/
itemwidth = textwidth + config.triangle_width + config.horzpadding * 3;
- itemwidth += (iflag) ? 0 : config.iconsize + config.horzpadding;
+ itemwidth += (iflag || !menu->hasicon) ? 0 : config.iconsize + config.horzpadding;
menu->w = MAX(menu->w, itemwidth);
}
}
if (pflag || (config.posy > mon.y && mon.y + mon.h - config.posy >= height))
menu->y = config.posy;
- else if (config.screenh > height)
+ else if (mon.y + mon.h > height)
menu->y = mon.y + mon.h - height;
} else { /* else, calculate in respect to parent menu */
int parentwidth;
else if (menu->parent->x > menu->w + config.border_pixels + config.gap_pixels)
menu->x = menu->parent->x - menu->w - config.border_pixels - config.gap_pixels;
- if (mon.y + mon.h - (menu->caller->y + menu->parent->y) > height)
+ if (mon.y + mon.h - (menu->caller->y + menu->parent->y) >= height)
menu->y = menu->caller->y + menu->parent->y;
- else if (mon.y + mon.h - menu->parent->y > height)
- menu->y = menu->parent->y;
else if (mon.y + mon.h > height)
menu->y = mon.y + mon.h - height;
}
XStringListToTextProperty(&title, 1, &wintitle);
/* set window manager hints */
- sizeh.flags = PMaxSize | PMinSize;
+ sizeh.flags = USPosition | PMaxSize | PMinSize;
sizeh.min_width = sizeh.max_width = menu->w;
sizeh.min_height = sizeh.max_height = menu->h;
XSetWMProperties(dpy, menu->win, &wintitle, NULL, NULL, 0, &sizeh, NULL, classh);
/* draw text */
x = config.horzpadding;
- x += (iflag) ? 0 : config.horzpadding + config.iconsize;
+ x += (iflag || !menu->hasicon) ? 0 : config.horzpadding + config.iconsize;
dsel = XftDrawCreate(dpy, item->sel, visual, colormap);
dunsel = XftDrawCreate(dpy, item->unsel, visual, colormap);
XSetForeground(dpy, dc.gc, dc.selected[ColorFG].pixel);