nilix/tint2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleanup duplicate code and fixed ALLDESKTOP task

Browse source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@569 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
thilor77 2010-09-26 17:07:33 +00:00
parent c569722617
commit 301aff0f10
4 changed files with 23 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/panel.c
View file

@ -304,7 +304,7 @@ void init_panel_size_and_position(Panel *panel)
int resize_panel(void *obj)
{
int ret = resize_by_layout(obj);
resize_by_layout(obj, 0);
//printf("resize_panel\n");
if (panel_mode != MULTI_DESKTOP) {
@ -319,7 +319,7 @@ int resize_panel(void *obj)
panel->taskbar[i].area.resize = 1;
}
}
return ret;
return 0;
}

86
src/taskbar/taskbar.c
View file

@ -261,95 +261,27 @@ void task_refresh_tasklist ()
int resize_taskbar(void *obj)
{
//int ret = resize_by_layout(obj);
// on_changed
// taskbar->text_width = pixel_width - panel->g_task.text_posx - panel->g_task.area.bg->border.width - panel->g_task.area.paddingx;
//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;
//return ret;
Taskbar *taskbar = (Taskbar*)obj;
Panel *panel = (Panel*)taskbar->area.panel;
int text_width;
Task *tsk;
GSList *l;
int task_count, border_width;
//printf("resize_taskbar %d %d\n", taskbar->area.posx, taskbar->area.posy);
// taskbar->area.redraw = 1;
border_width = taskbar->area.bg->border.width;
if (panel_horizontal) {
int pixel_width, modulo_width=0;
int taskbar_width, old_width;
resize_by_layout(obj, panel->g_task.maximum_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;
old_width = tsk->area.width;
tsk->area.width = pixel_width;
if (modulo_width) {
tsk->area.width++;
modulo_width--;
}
if (tsk->area.width != old_width)
tsk->area.on_changed = 1;
text_width = panel->g_task.maximum_width;
if (taskbar->area.list != NULL) {
tsk = taskbar->area.list->data;
text_width = tsk->area.width;
}
taskbar->text_width = text_width - panel->g_task.text_posx - panel->g_task.area.bg->border.width - panel->g_task.area.paddingx;
}
else {
int pixel_height, modulo_height=0;
int taskbar_height, old_height;
resize_by_layout(obj, panel->g_task.maximum_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;
old_height = tsk->area.height;
tsk->area.height = pixel_height;
if (modulo_height) {
tsk->area.height++;
modulo_height--;
}
if (tsk->area.height != old_height)
tsk->area.on_changed = 1;
}
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;
}
return 0;
}

10
src/util/area.c
View file

@ -221,7 +221,7 @@ void refresh (Area *a)
}
int resize_by_layout(void *obj)
int resize_by_layout(void *obj, int maximum_size)
{
Area *child, *a = (Area*)obj;
int size, nb_by_content=0, nb_by_layout=0;
@ -247,6 +247,10 @@ int resize_by_layout(void *obj)
if (nb_by_layout) {
width = size / nb_by_layout;
modulo = size % nb_by_layout;
if (width > maximum_size && maximum_size != 0) {
width = maximum_size;
modulo = 0;
}
}
// resize SIZE_BY_LAYOUT objects
@ -284,6 +288,10 @@ int resize_by_layout(void *obj)
if (nb_by_layout) {
height = size / nb_by_layout;
modulo = size % nb_by_layout;
if (height > maximum_size && maximum_size != 0) {
height = maximum_size;
modulo = 0;
}
}
// resize SIZE_BY_LAYOUT objects

2
src/util/area.h
View file

@ -101,7 +101,7 @@ void size_by_layout (Area *a, int pos, int level);
void refresh (Area *a);
// generic resize for SIZE_BY_LAYOUT objects
int resize_by_layout(void *obj);
int resize_by_layout(void *obj, int maximum_size);
// set 'redraw' on an area and childs
void set_redraw (Area *a);