X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftaskbar%2Ftaskbar.c;h=59ff52b535b70976137bd9e538cb35cfeb2e192a;hb=1c1cfea95e549170ede1eaf05240b935aa2186a9;hp=3b61e22e72264c389bf424fc08f69a1e023510a5;hpb=6e668134333e653f2a856efbd215688cea870dc9;p=chaz%2Ftint2

diff --git a/src/taskbar/taskbar.c b/src/taskbar/taskbar.c
index 3b61e22..59ff52b 100644
--- a/src/taskbar/taskbar.c
+++ b/src/taskbar/taskbar.c
@@ -2,7 +2,7 @@
 *
 * Tint2 : taskbar
 *
-* Copyright (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr)
+* Copyright (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) from Omega distribution
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License version 2
@@ -113,6 +113,7 @@ void init_taskbar_panel(void *p)
 	panel->g_taskbar.area.size_mode = SIZE_BY_LAYOUT;
 	panel->g_taskbar.area._resize = resize_taskbar;
 	panel->g_taskbar.area._draw_foreground = draw_taskbar;
+	panel->g_taskbar.area._on_change_layout = on_change_taskbar;
 	panel->g_taskbar.area.redraw = 1;
 	panel->g_taskbar.area.on_screen = 1;
 	if (panel_horizontal) {
@@ -299,15 +300,39 @@ int resize_taskbar(void *obj)
 }
 
 
+void on_change_taskbar (void *obj)
+{
+	Taskbar *tskbar = obj;
+	int k;
+
+	// reset Pixmap when position/size changed
+	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;
+	tskbar->area.redraw = 1;
+}
+
+
 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 (tskbar->state_pix[state] == 0) {
-		tskbar->area.redraw = 1;
-		GSList *l;
-		for (l = tskbar->area.list ; l ; l = l->next)
-			((Area*)l->data)->redraw = 1;
+	if (panel_mode != MULTI_DESKTOP) { 
+		if (state == TASKBAR_NORMAL)
+			tskbar->area.on_screen = 0;
+		else
+			tskbar->area.on_screen = 1;
+	}
+	if (tskbar->area.on_screen == 1) {
+		if (tskbar->state_pix[state] == 0)
+			tskbar->area.redraw = 1;
+		if (panel_mode == MULTI_DESKTOP && panel1[0].g_taskbar.background[TASKBAR_NORMAL] != panel1[0].g_taskbar.background[TASKBAR_ACTIVE]) {
+			GSList *l;
+			for (l = tskbar->area.list ; l ; l = l->next)
+				set_task_redraw(l->data);
+		}
 	}
 	panel_refresh = 1;
 }