X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Futil%2Farea.c;h=dafd947773144ca34fb8846a385457a454159711;hb=c75069e03de761de15a6d74a4df0d7dbe6672b6e;hp=ce122a2178d5f31de655c074da6aa6f380d1d0ea;hpb=7a03bbf353324d6803aa84ca8fd41e6c6f4d099c;p=chaz%2Ftint2 diff --git a/src/util/area.c b/src/util/area.c index ce122a2..dafd947 100644 --- a/src/util/area.c +++ b/src/util/area.c @@ -51,7 +51,9 @@ * 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 @@ -68,15 +70,30 @@ * '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; @@ -99,6 +116,7 @@ void size_by_content (Area *a) 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; @@ -106,6 +124,7 @@ void size_by_content (Area *a) if (a->_resize(a)) { // 'size' changed => 'resize = 1' on the parent and redraw object ((Area*)a->parent)->resize = 1; + a->on_changed = 1; a->redraw = 1; } } @@ -127,6 +146,7 @@ void size_by_layout (Area *a, int pos, int level) if (a->_resize) { if (a->_resize(a)) { // if 'size' changed then 'resize = 1' on childs with SIZE_BY_LAYOUT + a->on_changed = 1; for (l = a->list; l ; l = l->next) { if (((Area*)l->data)->size_mode == SIZE_BY_LAYOUT) ((Area*)l->data)->resize = 1; @@ -140,19 +160,37 @@ void size_by_layout (Area *a, int pos, int level) 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; + child->redraw = 1; + } + } + else { + if (pos != child->posy) { + // pos changed => redraw + child->posy = pos; + child->on_changed = 1; + child->redraw = 1; + } } //printf("level %d, object %d, pos %d\n", level, i, pos); 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 && a->_on_change_layout) + a->_on_change_layout (a); } @@ -185,6 +223,86 @@ void refresh (Area *a) } +int resize_by_layout(void *obj) +{ + 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++; + } + if (nb_by_content+nb_by_layout) + size -= ((nb_by_content+nb_by_layout-1) * a->paddingx); + //printf("resize_panel : size_panel %d, size_layout %d\n", panel->area.width, size); + + int width=0, modulo=0; + if (nb_by_layout) { + width = size / nb_by_layout; + modulo = size % nb_by_layout; + } + + // 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) { + child->width = width; + child->resize = 1; + if (modulo) { + child->width++; + modulo--; + } + } + } + } + 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; + if (nb_by_layout) { + height = size / nb_by_layout; + modulo = size % nb_by_layout; + } + + // 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) { + child->height = height; + child->resize = 1; + if (modulo) { + child->height++; + modulo--; + } + } + } + } + return 0; +} + + void set_redraw (Area *a) { a->redraw = 1; @@ -194,6 +312,26 @@ void set_redraw (Area *a) 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) {