X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Ftaskbar%2Ftaskbar.c;h=e1756441692fd974f3202c941ba3295d9cb27255;hb=b9ceca0af9fbad70fe14f087ccdda72d8c7e7cf6;hp=eae04dfbd94e82e0c175bf91ce9f115c6a6d4fec;hpb=d1325f97fb4fb3267c4c8955d9f2bf4c165da928;p=chaz%2Ftint2

diff --git a/src/taskbar/taskbar.c b/src/taskbar/taskbar.c
index eae04df..e175644 100644
--- a/src/taskbar/taskbar.c
+++ b/src/taskbar/taskbar.c
@@ -121,8 +121,6 @@ void cleanup_taskbar()
 	GSList *l0;
 	Task *tsk;
 
-	if (panel_config.g_task.font_desc)
-		pango_font_description_free(panel_config.g_task.font_desc);
 	for (i=0 ; i < nb_panel ; i++) {
 		panel = &panel1[i];
 
@@ -224,12 +222,16 @@ void resize_taskbar(void *obj)
 	Panel *panel = (Panel*)taskbar->area.panel;
 	Task *tsk;
 	GSList *l;
-	int  task_count;
+	int  task_count, border_width;
 
 	//printf("resize_taskbar : posx et width des taches\n");
-
 	taskbar->area.redraw = 1;
 
+	if (taskbar->area.is_active && taskbar->area.use_active)
+		border_width = taskbar->area.pix_active.border.width;
+	else
+		border_width = taskbar->area.pix.border.width;
+
 	if (panel_horizontal) {
 		int  pixel_width, modulo_width=0;
 		int  x, taskbar_width;
@@ -238,7 +240,7 @@ void resize_taskbar(void *obj)
 		task_count = g_slist_length(taskbar->area.list);
 		if (!task_count) pixel_width = panel->g_task.maximum_width;
 		else {
-			taskbar_width = taskbar->area.width - (2 * panel->g_taskbar.pix.border.width) - (2 * panel->g_taskbar.paddingxlr);
+			taskbar_width = taskbar->area.width - (2 * border_width) - (2 * panel->g_taskbar.paddingxlr);
 			if (task_count>1) taskbar_width -= ((task_count-1) * panel->g_taskbar.paddingx);
 
 			pixel_width = taskbar_width / task_count;
@@ -248,16 +250,12 @@ void resize_taskbar(void *obj)
 				modulo_width = taskbar_width % task_count;
 		}
 
-		if ((taskbar->task_width == pixel_width) && (taskbar->task_modulo == modulo_width)) {
-		}
-		else {
-			taskbar->task_width = pixel_width;
-			taskbar->task_modulo = modulo_width;
-			taskbar->text_width = pixel_width - panel->g_task.text_posx - panel->g_task.area.pix.border.width - panel->g_task.area.paddingx;
-		}
+		taskbar->task_width = pixel_width;
+		taskbar->task_modulo = modulo_width;
+		taskbar->text_width = pixel_width - panel->g_task.text_posx - panel->g_task.area.pix.border.width - panel->g_task.area.paddingx;
 
 		// change pos_x and width for all tasks
-		x = taskbar->area.posx + taskbar->area.pix.border.width + taskbar->area.paddingxlr;
+		x = taskbar->area.posx + border_width + taskbar->area.paddingxlr;
 		for (l = taskbar->area.list; l ; l = l->next) {
 			tsk = l->data;
 			if (!tsk->area.on_screen) continue;
@@ -279,7 +277,7 @@ void resize_taskbar(void *obj)
 		task_count = g_slist_length(taskbar->area.list);
 		if (!task_count) pixel_height = panel->g_task.maximum_height;
 		else {
-			taskbar_height = taskbar->area.height - (2 * panel->g_taskbar.pix.border.width) - (2 * panel->g_taskbar.paddingxlr);
+			taskbar_height = taskbar->area.height - (2 * border_width) - (2 * panel->g_taskbar.paddingxlr);
 			if (task_count>1) taskbar_height -= ((task_count-1) * panel->g_taskbar.paddingx);
 
 			pixel_height = taskbar_height / task_count;
@@ -289,16 +287,12 @@ void resize_taskbar(void *obj)
 				modulo_height = taskbar_height % task_count;
 		}
 
-		if ((taskbar->task_width == pixel_height) && (taskbar->task_modulo == modulo_height)) {
-		}
-		else {
-			taskbar->task_width = pixel_height;
-			taskbar->task_modulo = modulo_height;
-			taskbar->text_width = taskbar->area.width - (2 * panel->g_taskbar.paddingy) - panel->g_task.text_posx - panel->g_task.area.pix.border.width - panel->g_task.area.paddingx;
-		}
+		taskbar->task_width = pixel_height;
+		taskbar->task_modulo = modulo_height;
+		taskbar->text_width = taskbar->area.width - (2 * panel->g_taskbar.paddingy) - panel->g_task.text_posx - panel->g_task.area.pix.border.width - panel->g_task.area.paddingx;
 
 		// change pos_y and height for all tasks
-		y = taskbar->area.posy + taskbar->area.pix.border.width + taskbar->area.paddingxlr;
+		y = taskbar->area.posy + border_width + taskbar->area.paddingxlr;
 		for (l = taskbar->area.list; l ; l = l->next) {
 			tsk = l->data;
 			if (!tsk->area.on_screen) continue;