merge battery applet from Sebastian Reichel

[chaz/tint2] / src / systray / systraybar.c

diff --git a/src/systray/systraybar.c b/src/systray/systraybar.c
index 160cbca17cb26946f905d521a19f079e526458f0..5840bef066905d15b63cca4554d2587d9e76de16 100644 (file)
--- a/src/systray/systraybar.c
+++ b/src/systray/systraybar.c
@@ -66,6 +66,8 @@ void init_systray()
        systray.area.posx = panel->area.width - panel->area.paddingxlr - panel->area.pix.border.width - systray.area.width;
        if (panel->clock.area.on_screen)
                systray.area.posx -= (panel->clock.area.width + panel->area.paddingx);
+       if (panel->battery.area.on_screen)
+               systray.area.posx -= (panel->battery.area.width + panel->area.paddingx);
 
        systray.area.redraw = 1;
 }
@@ -141,6 +143,8 @@ void resize_systray(void *obj)
        systray.area.posx = panel->area.width - panel->area.pix.border.width - panel->area.paddingxlr - systray.area.width;
        if (panel->clock.area.on_screen)
                systray.area.posx -= (panel->clock.area.width + panel->area.paddingx);
+       if (panel->battery.area.on_screen)
+               systray.area.posx -= (panel->battery.area.width + panel->area.paddingx);
 
        systray.area.redraw = 1;