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

cleanup code

Browse Source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@562 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
thilor77
2010-09-23 18:09:30 +00:00
parent e68c361951
commit 98c3cbe874
10 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/taskbar/task.c
View File

@@ -342,6 +342,7 @@ void draw_task (void *obj, cairo_t *c)
Color *config_text;
int width=0, height;
Panel *panel = (Panel*)tsk->area.panel;
//printf("draw_task %d %d\n", tsk->area.posx, tsk->area.posy);
if (panel->g_task.text) {
/* Layout */

31
src/taskbar/taskbar.c
View File

@@ -198,7 +198,7 @@ void init_taskbar_panel(void *p)
tskbar = &panel->taskbar[j];
memcpy(&tskbar->area, &panel->g_taskbar, sizeof(Area));
tskbar->desktop = j;
if (j == server.desktop && panel->g_taskbar.use_active)
if (j == server.desktop)
tskbar->area.bg = panel->g_taskbar.bg_active;
}
}
@@ -266,9 +266,7 @@ int resize_taskbar(void *obj)
GSList *l;
int task_count, border_width;
//printf("resize_taskbar : posx et width des taches\n");
taskbar->area.redraw = 1;
// taskbar->area.redraw = 1;
border_width = taskbar->area.bg->border.width;
if (panel_horizontal) {
@@ -297,7 +295,7 @@ int resize_taskbar(void *obj)
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)
//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 };
@@ -335,7 +333,7 @@ int resize_taskbar(void *obj)
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)
//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 };
@@ -347,6 +345,27 @@ int resize_taskbar(void *obj)
}
}
}
return 0;
}
void visible_taskbar(void *p)
{
Panel *panel =(Panel*)p;
int j;
Taskbar *taskbar;
for (j=0 ; j < panel->nb_desktop ; j++) {
taskbar = &panel->taskbar[j];
if (panel_mode != MULTI_DESKTOP && taskbar->desktop != server.desktop) {
// SINGLE_DESKTOP and not current desktop
taskbar->area.on_screen = 0;
}
else {
taskbar->area.on_screen = 1;
}
}
panel_refresh = 1;
}

4
src/taskbar/taskbar.h
View File

@@ -34,7 +34,6 @@ typedef struct {
Area area;
Background* bg;
Background* bg_active;
int use_active;
} Global_taskbar;
@@ -54,6 +53,9 @@ void task_refresh_tasklist ();
int resize_taskbar(void *obj);
// show/hide taskbar according to current desktop
void visible_taskbar(void *p);
#endif