+ systray.area.posx = panel->area.width - panel->area.bg->border.width - panel->area.paddingxlr - systray.area.width;
+ if (panel->clock.area.on_screen)
+ systray.area.posx -= (panel->clock.area.width + panel->area.paddingx);
+#ifdef ENABLE_BATTERY
+ if (panel->battery.area.on_screen)
+ systray.area.posx -= (panel->battery.area.width + panel->area.paddingx);
+#endif
+ }
+ else {
+ if (!count) systray.area.height = 0;
+ else {
+ int width = sysbar->area.width - 2*sysbar->area.bg->border.width - 2*sysbar->area.paddingy;
+ // here icons_per_row always higher than 0
+ icons_per_row = (width+sysbar->area.paddingx) / (icon_size+sysbar->area.paddingx);
+ marging = width - (icons_per_row-1)*(icon_size+sysbar->area.paddingx) - icon_size;
+ icons_per_column = count / icons_per_row+ (count%icons_per_row != 0);
+ systray.area.height = (2 * systray.area.bg->border.width) + (2 * systray.area.paddingxlr) + (icon_size * icons_per_column) + ((icons_per_column-1) * systray.area.paddingx);
+ }
+
+ systray.area.posy = panel->area.bg->border.width + panel->area.paddingxlr;
+ if (panel->clock.area.on_screen)
+ systray.area.posy += (panel->clock.area.height + panel->area.paddingx);
+#ifdef ENABLE_BATTERY
+ if (panel->battery.area.on_screen)
+ systray.area.posy += (panel->battery.area.height + panel->area.paddingx);
+#endif
+ }
+
+ int i, posx, posy;
+ int start = panel->area.bg->border.width + panel->area.paddingy + systray.area.bg->border.width + systray.area.paddingy +marging/2;
+ if (panel_horizontal) {
+ posy = start;
+ posx = systray.area.posx + systray.area.bg->border.width + systray.area.paddingxlr;
+ }
+ else {
+ posx = start;
+ posy = systray.area.posy + systray.area.bg->border.width + systray.area.paddingxlr;
+ }
+
+ for (i=1, l = systray.list_icons; l ; i++, l = l->next) {
+ traywin = (TrayWindow*)l->data;
+ if (traywin->hide) continue;
+
+ traywin->y = posy;
+ traywin->x = posx;
+ traywin->width = icon_size;
+ traywin->height = icon_size;
+ if (panel_horizontal) {
+ if (i % icons_per_column)
+ posy += icon_size + sysbar->area.paddingx;
+ else {
+ posy = start;
+ posx += (icon_size + systray.area.paddingx);
+ }
+ }
+ else {
+ if (i % icons_per_row)
+ posx += icon_size + systray.area.paddingx;
+ else {
+ posx = start;
+ posy += (icon_size + systray.area.paddingx);
+ }
+ }
+
+ // position and size the icon window
+ XMoveResizeWindow(server.dsp, traywin->id, traywin->x, traywin->y, icon_size, icon_size);
+ XResizeWindow(server.dsp, traywin->tray_id, icon_size, icon_size);