*
* Tint2 : area
*
-* 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
* - if 'size' changed then 'resize = 1' on the parent
* 2) browse tree SIZE_BY_LAYOUT and POSITION
* - resize SIZE_BY_LAYOUT node : parent is resized before children
- * - if 'size' changed then 'resize = 1' on childs with SIZE_BY_LAYOUT
* - calculate position (posx,posy) : parent is calculated before children
* - if 'position' changed then 'redraw = 1'
* 3) browse tree REDRAW
void rendering(void *obj)
{
Panel *panel = (Panel*)obj;
-
+
size_by_content(&panel->area);
- size_by_layout(&panel->area, 0, 0);
+ size_by_layout(&panel->area, 0, 1);
refresh(&panel->area);
}
size_by_content(l->data);
// calculate area's size
+ a->on_changed = 0;
if (a->resize && a->size_mode == SIZE_BY_CONTENT) {
a->resize = 0;
if (a->_resize) {
if (a->_resize(a)) {
- // 'size' changed => 'resize = 1' on the parent and redraw object
+ // 'size' changed => 'resize = 1' on the parent
((Area*)a->parent)->resize = 1;
+ a->on_changed = 1;
}
- a->redraw = 1;
}
}
}
a->resize = 0;
if (a->_resize) {
- if (a->_resize(a)) {
- // if 'size' changed then 'resize = 1' on childs with SIZE_BY_LAYOUT
- for (l = a->list; l ; l = l->next) {
- if (((Area*)l->data)->size_mode == SIZE_BY_LAYOUT)
- ((Area*)l->data)->resize = 1;
- }
+ a->_resize(a);
+ // resize childs with SIZE_BY_LAYOUT
+ for (l = a->list; l ; l = l->next) {
+ Area *child = ((Area*)l->data);
+ if (child->size_mode == SIZE_BY_LAYOUT && child->list)
+ child->resize = 1;
}
}
}
if (pos != child->posx) {
// pos changed => redraw
child->posx = pos;
- child->redraw = 1;
+ child->on_changed = 1;
}
}
else {
if (pos != child->posy) {
// pos changed => redraw
child->posy = pos;
- child->redraw = 1;
+ child->on_changed = 1;
}
}
- //printf("level %d, object %d, pos %d\n", level, i, pos);
+ /*// position of each visible object
+ int k;
+ for (k=0 ; k < level ; k++) printf(" ");
+ printf("tree level %d, object %d, pos %d, %s\n", level, i, pos, (child->size_mode == SIZE_BY_LAYOUT) ? "SIZE_BY_LAYOUT" : "SIZE_BY_CONTENT");*/
size_by_layout(child, pos, level+1);
if (panel_horizontal)
pos += child->width + a->paddingx;
else
pos += child->height + a->paddingx;
+ }
+
+ if (a->on_changed) {
+ // pos/size changed
+ a->redraw = 1;
+ if (a->_on_change_layout)
+ a->_on_change_layout (a);
}
}
if (a->redraw) {
a->redraw = 0;
// force redraw of child
- GSList *l;
- for (l = a->list ; l ; l = l->next)
- ((Area*)l->data)->redraw = 1;
-// set_redraw(l->data);
+ //GSList *l;
+ //for (l = a->list ; l ; l = l->next)
+ //((Area*)l->data)->redraw = 1;
//printf("draw area posx %d, width %d\n", a->posx, a->width);
draw(a);
}
-int resize_by_layout(void *obj)
+int resize_by_layout(void *obj, int maximum_size)
{
- Taskbar *taskbar = (Taskbar*)obj;
- Panel *panel = (Panel*)taskbar->area.panel;
- Task *tsk;
- GSList *l;
- int task_count, border_width;
-
- //printf("resize_taskbar : posx et width des taches\n");
- taskbar->area.redraw = 1;
-
- border_width = taskbar->area.bg->border.width;
+ Area *child, *a = (Area*)obj;
+ int size, nb_by_content=0, nb_by_layout=0;
- 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;
+ if (panel_horizontal) {
+ // detect free size for SIZE_BY_LAYOUT's Area
+ size = a->width - (2 * (a->paddingxlr + a->bg->border.width));
+ GSList *l;
+ for (l = a->list ; l ; l = l->next) {
+ child = (Area*)l->data;
+ if (child->on_screen && child->size_mode == SIZE_BY_CONTENT) {
+ size -= child->width;
+ nb_by_content++;
+ }
+ if (child->on_screen && child->size_mode == SIZE_BY_LAYOUT)
+ nb_by_layout++;
+ }
+ //printf(" resize_by_layout Deb %d, %d\n", nb_by_content, nb_by_layout);
+ if (nb_by_content+nb_by_layout)
+ size -= ((nb_by_content+nb_by_layout-1) * a->paddingx);
+
+ int width=0, modulo=0, old_width;
+ 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;
+ }
}
- 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--;
+ // resize SIZE_BY_LAYOUT objects
+ for (l = a->list ; l ; l = l->next) {
+ child = (Area*)l->data;
+ if (child->on_screen && child->size_mode == SIZE_BY_LAYOUT) {
+ old_width = child->width;
+ child->width = width;
+ if (modulo) {
+ child->width++;
+ modulo--;
+ }
+ if (child->width != old_width)
+ child->on_changed = 1;
}
}
}
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;
+ // detect free size for SIZE_BY_LAYOUT's Area
+ size = a->height - (2 * (a->paddingxlr + a->bg->border.width));
+ GSList *l;
+ for (l = a->list ; l ; l = l->next) {
+ child = (Area*)l->data;
+ if (child->on_screen && child->size_mode == SIZE_BY_CONTENT) {
+ size -= child->height;
+ nb_by_content++;
+ }
+ if (child->on_screen && child->size_mode == SIZE_BY_LAYOUT)
+ nb_by_layout++;
+ }
+ if (nb_by_content+nb_by_layout)
+ size -= ((nb_by_content+nb_by_layout-1) * a->paddingx);
+
+ int height=0, modulo=0, old_height;
+ 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;
+ }
}
- 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--;
+ // resize SIZE_BY_LAYOUT objects
+ for (l = a->list ; l ; l = l->next) {
+ child = (Area*)l->data;
+ if (child->on_screen && child->size_mode == SIZE_BY_LAYOUT) {
+ old_height = child->height;
+ child->height = height;
+ if (modulo) {
+ child->height++;
+ modulo--;
+ }
+ if (child->height != old_height)
+ child->on_changed = 1;
}
}
}
projects / chaz / tint2 / blobdiff