desktop name second step

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

diff --git a/src/taskbar/taskbar.c b/src/taskbar/taskbar.c
index d2ad54281d3627ad20c13b32437e67ce6db77b9e..640bda8058a3f00e64eac2ff7687fd245f773cd2 100644 (file)
--- a/src/taskbar/taskbar.c
+++ b/src/taskbar/taskbar.c
@@ -228,16 +228,6 @@ void init_taskbar_panel(void *p)
                        tskbar->area.bg = panel->g_taskbar.background[TASKBAR_ACTIVE];
                else
                        tskbar->area.bg = panel->g_taskbar.background[TASKBAR_NORMAL];
-               
-               if (taskbarname_enabled) {
-                       memcpy(&tskbar->bar_name.area, &panel->g_taskbar.area_name, sizeof(Area));
-                       tskbar->bar_name.area.parent = tskbar;
-                       if (j == server.desktop)
-                               tskbar->bar_name.area.bg = panel->g_taskbar.background_name[TASKBAR_ACTIVE];
-                       else
-                               tskbar->bar_name.area.bg = panel->g_taskbar.background_name[TASKBAR_NORMAL];
-                       tskbar->area.list = g_slist_append(tskbar->area.list, &tskbar->bar_name);
-               }
        }
        init_taskbarname_panel(panel);
 }
@@ -352,6 +342,10 @@ 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 (taskbarname_enabled) {
+               tskbar->bar_name.area.bg = panel1[0].g_taskbar.background_name[state];
+               tskbar->bar_name.area.pix = tskbar->bar_name.state_pix[state];
+       }
        if (panel_mode != MULTI_DESKTOP) { 
                if (state == TASKBAR_NORMAL)
                        tskbar->area.on_screen = 0;
@@ -361,6 +355,8 @@ void set_taskbar_state(Taskbar *tskbar, int state)
        if (tskbar->area.on_screen == 1) {
                if (tskbar->state_pix[state] == 0)
                        tskbar->area.redraw = 1;
+               if (taskbarname_enabled && tskbar->bar_name.state_pix[state] == 0)
+                       tskbar->bar_name.area.redraw = 1;
                if (panel_mode == MULTI_DESKTOP && panel1[0].g_taskbar.background[TASKBAR_NORMAL] != panel1[0].g_taskbar.background[TASKBAR_ACTIVE]) {
                        GSList *l = tskbar->area.list;
                        if (taskbarname_enabled) l = l->next;