- //taskbar_width -= (panel->trayer.area.width + panel->area.paddingx);
-
- taskbar_width = (taskbar_width - ((taskbar_on_screen-1) * panel->area.paddingx)) / taskbar_on_screen;
-
- if (taskbar_on_screen > 1)
- modulo_width = (taskbar_width - ((taskbar_on_screen-1) * panel->area.paddingx)) % taskbar_on_screen;
- else
+ if (panel->battery.area.on_screen && panel->battery.area.width)
+ taskbar_width -= (panel->battery.area.width + panel->area.paddingx);
+ // TODO : systray only on first panel. search better implementation !
+ if (systray.area.on_screen && systray.area.width && panel == &panel1[0])
+ taskbar_width -= (systray.area.width + panel->area.paddingx);
+
+ if (panel_mode == MULTI_DESKTOP) {
+ taskbar_on_screen = panel->nb_desktop;
+ int width = taskbar_width - ((taskbar_on_screen-1) * panel->area.paddingx);
+ taskbar_width = width / taskbar_on_screen;
+ modulo_width = width % taskbar_on_screen;
+ }
+ else {
+ taskbar_on_screen = 1;