issue 158 : dissociate object initialization from panel initialization

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

diff --git a/src/systray/systraybar.c b/src/systray/systraybar.c
index d9e3411e5d4fcff7bf4f6190b95f8f5c5ed57819..16dd079c57ce25060d414623bdd650e636a13900 100644 (file)
--- a/src/systray/systraybar.c
+++ b/src/systray/systraybar.c
@@ -47,24 +47,24 @@ int refresh_systray;
 
 void init_systray()
 {
-       Panel *panel = &panel1[0];
-
        if (systray.area.on_screen)
                systray.area.on_screen = init_net();
 
        if (!systray.area.on_screen)
                return;
 
-       systray.area.parent = panel;
-       systray.area.panel = panel;
        systray.area._draw_foreground = draw_systray;
        systray.area._resize = resize_systray;
        systray.area.resize = 1;
        systray.area.redraw = 1;
        refresh_systray = 0;
+}
+
+
+void init_systray_panel(void *p)
+{
+       Panel *panel =(Panel*)p;
 
-       // configure systray
-       // draw only one systray (even with multi panel)
        if (panel_horizontal) {
                systray.area.posy = panel->area.pix.border.width + panel->area.paddingy;
                systray.area.height = panel->area.height - (2 * systray.area.posy);
@@ -73,6 +73,8 @@ void init_systray()
                systray.area.posx = panel->area.pix.border.width + panel->area.paddingy;
                systray.area.width = panel->area.width - (2 * panel->area.pix.border.width) - (2 * panel->area.paddingy);
        }
+       systray.area.parent = p;
+       systray.area.panel = p;
 }