*
* 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
* DRAWING AND LAYERING ENGINE :
* Redrawing an object (like the clock) could come from an 'external event' (date change)
* or from a 'layering event' (position change).
- * The following 'drawing engine' take care of all 'layering event'.
+ * The following 'drawing engine' take care of :
+ * - posx/posy of all Area
+ * - 'layering event' propagation between object
* 1) browse tree SIZE_BY_CONTENT
* - resize SIZE_BY_CONTENT node : children are resized before parent
* - 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
* 'panel_items = SC' define a panel with just Systray and Clock.
* So the tree 'Panel.Area' will have 2 childs (Systray and Clock).
*
- * 1) ok
- * 2) ??
- * 3) ??
- * répartition entre niveau global et niveau local ??
- * size_by_content peut-il modifier redraw=1 en cas de changement ? ou est ce géré par chaque composant ?
- * size_by_layout peut-il modifier redraw ?
- *
************************************************************/
+void init_rendering(void *obj, int pos)
+{
+ Area *a = (Area*)obj;
+
+ // initialize fixed position/size
+ GSList *l;
+ for (l = a->list; l ; l = l->next) {
+ Area *child = ((Area*)l->data);
+ if (panel_horizontal) {
+ child->posy = pos + a->bg->border.width + a->paddingy;
+ child->height = a->height - (2 * (a->bg->border.width + a->paddingy));
+ init_rendering(child, child->posy);
+ }
+ else {
+ child->posx = pos + a->bg->border.width + a->paddingy;
+ child->width = a->width - (2 * (a->bg->border.width + a->paddingy));
+ init_rendering(child, child->posx);
+ }
+ }
+}
+
+
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->redraw = 1;
+ a->on_changed = 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;
}
}
}
int i=0;
for (l = a->list; l ; l = l->next) {
Area *child = ((Area*)l->data);
+ if (!child->on_screen) continue;
i++;
- if (pos != child->posx) {
- // pos changed => redraw
- child->posx = pos;
- child->redraw = 1;
+ if (panel_horizontal) {
+ if (pos != child->posx) {
+ // pos changed => redraw
+ child->posx = pos;
+ child->on_changed = 1;
+ }
+ }
+ else {
+ if (pos != child->posy) {
+ // pos changed => redraw
+ child->posy = pos;
+ 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);
- pos += child->width + a->paddingx;
+ 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 maximum_size)
+{
+ Area *child, *a = (Area*)obj;
+ int size, nb_by_content=0, nb_by_layout=0;
+
+ 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;
+ }
+ }
+
+ // 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 {
+ // 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;
+ }
+ }
+
+ // 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;
+ }
+ }
+ }
+ return 0;
+}
+
+
void set_redraw (Area *a)
{
a->redraw = 1;
set_redraw(l->data);
}
+void hide(Area *a)
+{
+ Area *parent = (Area*)a->parent;
+
+ a->on_screen = 0;
+ parent->resize = 1;
+ if (panel_horizontal)
+ a->width = 0;
+ else
+ a->height = 0;
+}
+
+void show(Area *a)
+{
+ Area *parent = (Area*)a->parent;
+
+ a->on_screen = 1;
+ parent->resize = 1;
+ a->resize = 1;
+}
void draw (Area *a)
{
projects / chaz / tint2 / blobdiff