- Panel *panel = ((Area*)obj)->panel;
- int taskbar_width, modulo_width, taskbar_on_screen;
-
- if (panel_mode == MULTI_DESKTOP) taskbar_on_screen = panel->nb_desktop;
- else taskbar_on_screen = 1;
-
- taskbar_width = panel->area.width - (2 * panel->area.paddingxlr) - (2 * panel->area.pix.border.width);
- if (time1_format)
- taskbar_width -= (panel->clock.area.width + panel->area.paddingx);
- //taskbar_width -= (panel->trayer.area.width + panel->area.paddingx);
-
- taskbar_width = (taskbar_width - ((taskbar_on_screen-1) * panel->area.paddingx)) / taskbar_on_screen;
-
- if (taskbar_on_screen > 1)
- modulo_width = (taskbar_width - ((taskbar_on_screen-1) * panel->area.paddingx)) % taskbar_on_screen;
- else
- modulo_width = 0;
-
- int i, modulo=0, posx=0;
- for (i=0 ; i < panel->nb_desktop ; i++) {
- if ((i % taskbar_on_screen) == 0) {
- posx = panel->area.pix.border.width + panel->area.paddingxlr;
- modulo = modulo_width;
- }
- else posx += taskbar_width + panel->area.paddingx;
-
- panel->taskbar[i].area.posx = posx;
- panel->taskbar[i].area.width = taskbar_width;
- if (modulo) {
- panel->taskbar[i].area.width++;
- modulo--;
- }
-
- set_redraw (&panel->taskbar[i].area);
- resize_tasks(&panel->taskbar[i]);
- }
+ Taskbar *taskbar = (Taskbar*)obj;
+ Panel *panel = (Panel*)taskbar->area.panel;
+ Task *tsk;
+ GSList *l;
+ int task_count, border_width;
+
+// taskbar->area.redraw = 1;
+ border_width = taskbar->area.bg->border.width;
+
+ if (panel_horizontal) {
+ int pixel_width, modulo_width=0;
+ int taskbar_width;
+
+ // new task width for 'desktop'
+ 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 * border_width) - (2 * panel->g_taskbar.area.paddingxlr);
+ if (task_count>1) taskbar_width -= ((task_count-1) * panel->g_taskbar.area.paddingx);
+
+ pixel_width = taskbar_width / task_count;
+ if (pixel_width > panel->g_task.maximum_width)
+ pixel_width = panel->g_task.maximum_width;
+ else
+ modulo_width = taskbar_width % task_count;
+ }
+
+ taskbar->task_width = pixel_width;
+ taskbar->task_modulo = modulo_width;
+ taskbar->text_width = pixel_width - panel->g_task.text_posx - panel->g_task.area.bg->border.width - panel->g_task.area.paddingx;
+
+ // change pos_x and width for all tasks
+ for (l = taskbar->area.list; l ; l = l->next) {
+ tsk = l->data;
+ if (!tsk->area.on_screen) continue;
+ //set_task_redraw(tsk); // always redraw task, because the background could have changed (taskbar_active_id)
+ tsk->area.width = pixel_width;
+// TODO : move later (when posx is known)
+// long value[] = { panel->posx+x, panel->posy, pixel_width, panel->area.height };
+// XChangeProperty (server.dsp, tsk->win, server.atom._NET_WM_ICON_GEOMETRY, XA_CARDINAL, 32, PropModeReplace, (unsigned char*)value, 4);
+
+ if (modulo_width) {
+ tsk->area.width++;
+ modulo_width--;
+ }
+ }
+ }
+ else {
+ int pixel_height, modulo_height=0;
+ int taskbar_height;
+
+ // new task width for 'desktop'
+ 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 * border_width) - (2 * panel->g_taskbar.area.paddingxlr);
+ if (task_count>1) taskbar_height -= ((task_count-1) * panel->g_taskbar.area.paddingx);
+
+ pixel_height = taskbar_height / task_count;
+ if (pixel_height > panel->g_task.maximum_height)
+ pixel_height = panel->g_task.maximum_height;
+ else
+ modulo_height = taskbar_height % task_count;
+ }
+
+ taskbar->task_width = pixel_height;
+ taskbar->task_modulo = modulo_height;
+ taskbar->text_width = taskbar->area.width - (2 * panel->g_taskbar.area.paddingy) - panel->g_task.text_posx - panel->g_task.area.bg->border.width - panel->g_task.area.paddingx;
+
+ // change pos_y and height for all tasks
+ for (l = taskbar->area.list; l ; l = l->next) {
+ tsk = l->data;
+ if (!tsk->area.on_screen) continue;
+ //set_task_redraw(tsk); // always redraw task, because the background could have changed (taskbar_active_id)
+ tsk->area.height = pixel_height;
+// TODO : move later (when posy is known)
+// long value[] = { panel->posx, panel->posy+y, panel->area.width, pixel_height };
+// XChangeProperty (server.dsp, tsk->win, server.atom._NET_WM_ICON_GEOMETRY, XA_CARDINAL, 32, PropModeReplace, (unsigned char*)value, 4);
+
+ if (modulo_height) {
+ tsk->area.height++;
+ modulo_height--;
+ }
+ }
+ }
+
+ return 0;