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

[chaz/tint2] / src / config.c

diff --git a/src/config.c b/src/config.c
index dc4a30ace2397a89e60b99afc111edf3e164c883..d2b341481e6ca9a6c1fa90772dc9c3f3b82a7bbf 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -454,15 +454,15 @@ void add_entry (char *key, char *value)
        else if (strcmp (key, "taskbar_background_id") == 0) {
                int id = atoi (value);
                id = (id < backgrounds->len && id >= 0) ? id : 0;
-               panel_config.g_taskbar.bg = &g_array_index(backgrounds, Background, id);
-               if (panel_config.g_taskbar.bg_active == 0)
-                       panel_config.g_taskbar.bg_active = panel_config.g_taskbar.bg;
-               panel_config.g_taskbar.area.bg = panel_config.g_taskbar.bg;
+               panel_config.g_taskbar.background[TASKBAR_NORMAL] = &g_array_index(backgrounds, Background, id);
+               if (panel_config.g_taskbar.background[TASKBAR_ACTIVE] == 0)
+                       panel_config.g_taskbar.background[TASKBAR_ACTIVE] = panel_config.g_taskbar.background[TASKBAR_NORMAL];
+               //panel_config.g_taskbar.area.bg = panel_config.g_taskbar.bg;
        }
        else if (strcmp (key, "taskbar_active_background_id") == 0) {
                int id = atoi (value);
                id = (id < backgrounds->len && id >= 0) ? id : 0;
-               panel_config.g_taskbar.bg_active = &g_array_index(backgrounds, Background, id);
+               panel_config.g_taskbar.background[TASKBAR_ACTIVE] = &g_array_index(backgrounds, Background, id);
        }
        else if (strcmp (key, "taskbar_name") == 0) {
                taskbarname_enabled = atoi (value);
@@ -471,9 +471,11 @@ void add_entry (char *key, char *value)
        }
        else if (strcmp (key, "taskbar_name_active_background_id") == 0) {
        }
-       else if (strcmp (key, "taskbar_font_color") == 0) {
+       else if (strcmp (key, "taskbar_name_font") == 0) {
        }
-       else if (strcmp (key, "taskbar_active_font_color") == 0) {
+       else if (strcmp (key, "taskbar_name_font_color") == 0) {
+       }
+       else if (strcmp (key, "taskbar_name_active_font_color") == 0) {
        }
 
        /* Task */