memorized taskbar pixmap. So we don t redraw taskbar/task when switching desktop.

[chaz/tint2] / src / tint.c

diff --git a/src/tint.c b/src/tint.c
index 22f67da01d76b7ea5cc4aff2914d976ed646fa06..b975fecf50a987dde7dc7af203efd3b806aaa630 100644 (file)
--- a/src/tint.c
+++ b/src/tint.c
@@ -156,7 +156,6 @@ void init_X11()
 
 void cleanup()
 {
-       cleanup_timeout();
        cleanup_systray();
        cleanup_tooltip();
        cleanup_clock();
@@ -174,6 +173,7 @@ void cleanup()
        imlib_context_disconnect_display();
 
        cleanup_server();
+       cleanup_timeout();
        if (server.dsp) XCloseDisplay(server.dsp);
 }
 
@@ -513,17 +513,8 @@ void event_property_notify (XEvent *e)
                        server.desktop = server_get_current_desktop ();
                        for (i=0 ; i < nb_panel ; i++) {
                                Panel *panel = &panel1[i];
-                               if (panel_mode == MULTI_DESKTOP && panel->g_taskbar.bg != panel->g_taskbar.bg_active) {
-                                       // redraw both taskbar
-                                       if (server.nb_desktop > old_desktop) {
-                                               // can happen if last desktop is deleted and we've been on the last desktop
-                                               panel->taskbar[old_desktop].area.bg = panel->g_taskbar.bg;
-                                               panel->taskbar[old_desktop].area.resize = 1;
-                                       }
-                                       panel->taskbar[server.desktop].area.bg = panel->g_taskbar.bg_active;
-                                       panel->taskbar[server.desktop].area.resize = 1;
-                                       panel_refresh = 1;
-                               }
+                               set_taskbar_state(&panel->taskbar[old_desktop], TASKBAR_NORMAL);
+                               set_taskbar_state(&panel->taskbar[server.desktop], TASKBAR_ACTIVE);
                                // check ALLDESKTOP task => resize taskbar
                                Taskbar *tskbar;
                                Task *tsk;