fixed multi_desktop switching

[chaz/tint2] / src / taskbar / taskbar.c

diff --git a/src/taskbar/taskbar.c b/src/taskbar/taskbar.c
index 89267f6e591fcc55d5cccfc39f37ac8fae0ee519..87c7bd495dbf80d5e17c828155a69e140eb70e21 100644 (file)
--- a/src/taskbar/taskbar.c
+++ b/src/taskbar/taskbar.c
@@ -60,13 +60,16 @@ void cleanup_taskbar()
 {
        Panel *panel;
        Taskbar *tskbar;
-       int i, j;
+       int i, j, k;
 
        if (win_to_task_table) g_hash_table_foreach(win_to_task_table, taskbar_remove_task, 0);
        for (i=0 ; i < nb_panel ; i++) {
                panel = &panel1[i];
                for (j=0 ; j < panel->nb_desktop ; j++) {
                        tskbar = &panel->taskbar[j];
+                       for (k=0; k<TASKBAR_STATE_COUNT; ++k) {
+                               if (tskbar->state_pix[k]) XFreePixmap(server.dsp, tskbar->state_pix[k]);
+                       }
                        free_area (&tskbar->area);
                        // remove taskbar from the panel
                        panel->area.list = g_slist_remove(panel->area.list, tskbar);
@@ -300,11 +303,20 @@ void set_taskbar_state(Taskbar *tskbar, int state)
 {
        tskbar->area.bg = panel1[0].g_taskbar.background[state];
        tskbar->area.pix = tskbar->state_pix[state];
-       if (tskbar->state_pix[state] == 0) {
-               tskbar->area.redraw = 1;
-               GSList *l;
-               for (l = tskbar->area.list ; l ; l = l->next)
-                       ((Area*)l->data)->redraw = 1;
+       if (panel_mode != MULTI_DESKTOP) { 
+               if (state == TASKBAR_NORMAL)
+                       tskbar->area.on_screen = 0;
+               else
+                       tskbar->area.on_screen = 1;
+       }
+       if (tskbar->area.on_screen == 1) {
+               if (tskbar->state_pix[state] == 0)
+                       tskbar->area.redraw = 1;
+               if (panel_mode == MULTI_DESKTOP && panel1[0].g_taskbar.background[TASKBAR_NORMAL] != panel1[0].g_taskbar.background[TASKBAR_ACTIVE]) {
+                       GSList *l;
+                       for (l = tskbar->area.list ; l ; l = l->next)
+                               set_task_redraw(l->data);
+               }
        }
        panel_refresh = 1;
 }