X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fpanel.c;h=3971bc8021564bd182f5ddea39db7eb9c85dc06c;hb=275fa7c8678c39a1c1f7437de12aac0144f61a85;hp=c388c4459c24d539d33205601eeb51431c93f058;hpb=b1cdb484a3b06d20e0b9b14ae0c98721ad3fead0;p=chaz%2Ftint2

diff --git a/src/panel.c b/src/panel.c
index c388c44..3971bc8 100644
--- a/src/panel.c
+++ b/src/panel.c
@@ -303,11 +303,11 @@ void init_panel_size_and_position(Panel *panel)
 
 
 int resize_panel(void *obj)
-{	
-	int ret = resize_by_layout(obj);
+{
+	resize_by_layout(obj, 0);
 	
 	//printf("resize_panel\n");
-	if (panel_mode != MULTI_DESKTOP) {
+	if (panel_mode != MULTI_DESKTOP && taskbar_enabled) {
 		// propagate width/height on hidden taskbar
 		int i, width, height;
 		Panel *panel = (Panel*)obj;
@@ -319,7 +319,7 @@ int resize_panel(void *obj)
 			panel->taskbar[i].area.resize = 1;
 		}
 	}
-	return ret;
+	return 0;
 }
 
 
@@ -530,11 +530,16 @@ void set_panel_background(Panel *p)
 		set_redraw(a);
 	}
 	
-	// reset task 'state_pix'
-	int i;
+	// reset task/taskbar 'state_pix'
+	int i, k;
 	Taskbar *tskbar;
 	for (i=0 ; i < p->nb_desktop ; i++) {
 		tskbar = &p->taskbar[i];
+		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;
+		}
+		tskbar->area.pix = 0;
 		for (l0 = tskbar->area.list; l0 ; l0 = l0->next) {
 			set_task_redraw((Task *)l0->data);
 		}