Mabox/tint2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed bug in taskbar drawing

Browse Source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@245 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
lorthiois@bbsoft.fr
2009-10-31 11:58:45 +00:00
parent 12e73beb50
commit e8b4fb6bbc
4 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/taskbar/taskbar.c
View File

@@ -222,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;
@@ -236,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;
@@ -246,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;
@@ -277,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;
@@ -287,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;