*
* 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
{
Panel *panel;
Taskbar *tskbar;
- int i, j;
+ int i, j, k;
if (win_to_task_table) g_hash_table_foreach(win_to_task_table, taskbar_remove_task, 0);
for (i=0 ; i < nb_panel ; i++) {
panel = &panel1[i];
for (j=0 ; j < panel->nb_desktop ; j++) {
tskbar = &panel->taskbar[j];
+ for (k=0; k<TASKBAR_STATE_COUNT; ++k) {
+ if (tskbar->state_pix[k]) XFreePixmap(server.dsp, tskbar->state_pix[k]);
+ }
free_area (&tskbar->area);
// remove taskbar from the panel
panel->area.list = g_slist_remove(panel->area.list, tskbar);
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) {
}
+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;
}