fixed issue 309

[chaz/tint2] / src / panel.c

diff --git a/src/panel.c b/src/panel.c
index 96f20ccbe411744031f8357730fc0d2fe5af69b0..cea2923ff834ab8e8b4f3619156ff7672d98364e 100644 (file)
--- a/src/panel.c
+++ b/src/panel.c
@@ -182,8 +182,9 @@ void init_panel()
                        if (panel_items_order[k] == 'B')
                                init_battery_panel(p);
 #endif
-                       if (panel_items_order[k] == 'S') {
+                       if (panel_items_order[k] == 'S' && i==0) {
                                // TODO : check systray is only on 1 panel
+                               // at the moment only on panel1[0] allowed
                                init_systray_panel(p);
                                refresh_systray = 1;
                        }
@@ -198,7 +199,7 @@ void init_panel()
                p->main_win = XCreateWindow(server.dsp, server.root_win, p->posx, p->posy, p->area.width, p->area.height, 0, server.depth, InputOutput, server.visual, mask, &att);
 
                long event_mask = ExposureMask|ButtonPressMask|ButtonReleaseMask|ButtonMotionMask;
-               if (g_tooltip.enabled)
+               if (p->g_task.tooltip_enabled || p->clock.area._get_tooltip_text)
                        event_mask |= PointerMotionMask|LeaveWindowMask;
                if (panel_autohide)
                        event_mask |= LeaveWindowMask|EnterWindowMask;
@@ -397,8 +398,9 @@ void set_panel_items_order(Panel *p)
                if (panel_items_order[k] == 'B') 
                        p->area.list = g_slist_append(p->area.list, &p->battery);
 #endif
-               if (panel_items_order[k] == 'S') {
+               if (panel_items_order[k] == 'S' && p == panel1) {
                        // TODO : check systray is only on 1 panel
+                       // at the moment only on panel1[0] allowed
                        p->area.list = g_slist_append(p->area.list, &systray);
                }
                if (panel_items_order[k] == 'C')
@@ -537,8 +539,11 @@ void set_panel_background(Panel *p)
                for (k=0; k<TASKBAR_STATE_COUNT; ++k) {
                        if (tskbar->state_pix[k]) XFreePixmap(server.dsp, tskbar->state_pix[k]);
                        tskbar->state_pix[k] = 0;
+                       if (tskbar->bar_name.state_pix[k]) XFreePixmap(server.dsp, tskbar->bar_name.state_pix[k]);
+                       tskbar->bar_name.state_pix[k] = 0;
                }
                tskbar->area.pix = 0;
+               tskbar->bar_name.area.pix = 0;
                l0 = tskbar->area.list;
                if (taskbarname_enabled) l0 = l0->next;
                for (; l0 ; l0 = l0->next) {