fixed Issue 282 : second try

[chaz/tint2] / src / util / area.c

diff --git a/src/util/area.c b/src/util/area.c
index 498df86ee2234ed16b7a3bf69647b2d876051696..dd50c9e10e9e6a933c421c0bc9940bdc377bc07a 100644 (file)
--- a/src/util/area.c
+++ b/src/util/area.c
@@ -31,27 +31,38 @@
 #include "panel.h"
 
 
-/*
-// TODO : layering & drawing loop
-1) browse tree and calculate 'size' for SIZE_BY_CONTENT
-       - SIZE_BY_CONTENT loop calculate child first
-       - if 'size' changed then 'resize = 1' on the parent (tester resize aprés la boucle)
-       - size == width on horizontal panel and == height on vertical panel
-2) browse tree and calculate 'size' for SIZE_BY_LAYOUT
-       - SIZE_BY_LAYOUT loop calculate parent first
-       - if 'size' changed then 'resize = 1' on childs with SIZE_BY_LAYOUT
-       - calculate width = size - somme(child_with_of_SIZE_BY_CONTENT) modulo(number of child_SIZE_BY_LAYOUT)
-       - calculate modulo = 
-3) calculate posx of all objects
-4) redraw needed objects
-*/
+/************************************************************
+ * Layering & drawing loop of tint2
+ * 
+ * Areas in tint2 are similar to widgets in a GUI. 
+ * Areas (task, clock, systray, taskbar,...) are nodes in a tree.
+ * The position of each Area is defined by parent's position and brothers on the left.
+ * 
+ * !!! This design is experimental and not yet complete !!!!!!!!!!!!!
+ * 
+ * 1) browse tree and resize SIZE_BY_CONTENT node
+ *     - children node are resized before its parent
+ *     - if 'size' changed then 'resize = 1' on the parent
+ * 2) browse tree and resize SIZE_BY_LAYOUT node
+ *     - parent node is resized before its children
+ *     - if 'size' changed then 'resize = 1' on childs with SIZE_BY_LAYOUT
+ * 3) calculate posx of all objects
+ *     - parent's position is calculated before children's position
+ * 4) redraw needed objects
+ ************************************************************/
+
+void size_by_content (Area *a);
+void size_by_layout (Area *a);
+
 
 void refresh (Area *a)
 {
        // don't draw and resize hide objects
        if (!a->on_screen) return;
 
-       size(a);
+       //size(a);
+       size_by_content(a);
+       size_by_layout(a);
 
        // don't draw transparent objects (without foreground and without background)
        if (a->redraw) {
@@ -96,6 +107,49 @@ void size (Area *a)
 }
 
 
+void size_by_content (Area *a)
+{
+       // children node are resized before its parent
+       GSList *l;
+       for (l = a->list; l ; l = l->next)
+               size_by_content(l->data);
+       
+       // calculate current area's size
+       if (a->resize && a->size_mode == SIZE_BY_CONTENT) {
+               a->resize = 0;
+
+               // if 'size' changed then 'resize = 1' on the parent
+               if (a->_resize) {
+                       a->_resize(a);
+                       ((Area*)a->parent)->resize = 1;
+               }
+       }
+}
+
+
+void size_by_layout (Area *a)
+{
+       // parent node is resized before its children
+       // calculate current area's size
+       GSList *l;
+       if (a->resize && a->size_mode == SIZE_BY_LAYOUT) {
+               a->resize = 0;
+
+               // if 'size' changed then 'resize = 1' on childs with SIZE_BY_LAYOUT
+               if (a->_resize) {
+                       a->_resize(a);
+                       for (l = a->list; l ; l = l->next) {
+                               if (((Area*)l->data)->size_mode == SIZE_BY_LAYOUT)
+                                       ((Area*)l->data)->resize = 1;
+                       }
+               }
+       }
+
+       for (l = a->list; l ; l = l->next)
+               size_by_layout(l->data);        
+}
+
+
 void set_redraw (Area *a)
 {
        a->redraw = 1;
@@ -148,9 +202,9 @@ void draw_background (Area *a, cairo_t *c)
                draw_rect(c, a->bg->border.width/2.0, a->bg->border.width/2.0, a->width - a->bg->border.width, a->height - a->bg->border.width, a->bg->border.rounded);
                /*
                // convert : radian = degre * M_PI/180
-               // définir le dégradé dans un carré de (0,0) (100,100)
-               // ensuite ce dégradé est extrapolé selon le ratio width/height
-               // dans repère (0, 0) (100, 100)
+               // definir le degrade dans un carre de (0,0) (100,100)
+               // ensuite ce degrade est extrapoler selon le ratio width/height
+               // dans repere (0, 0) (100, 100)
                double X0, Y0, X1, Y1, degre;
                // x = X * (a->width / 100), y = Y * (a->height / 100)
                double x0, y0, x1, y1;
@@ -159,13 +213,13 @@ void draw_background (Area *a, cairo_t *c)
                X1 = 100;
                Y1 = 0;
                degre = 45;
-               // et ensuite faire la changement d'unité du repère
-               // car ce qui doit resté inchangée est les traits et pas la direction
+               // et ensuite faire la changement d'unite du repere
+               // car ce qui doit reste inchangee est les traits et pas la direction
 
-               // il faut d'abord appliquer une rotation de 90° (et -180° si l'angle est supérieur à 180°)
-               // ceci peut être appliqué une fois pour toute au départ
-               // ensuite calculer l'angle dans le nouveau repère
-               // puis faire une rotation de 90°
+               // il faut d'abord appliquer une rotation de 90 (et -180 si l'angle est superieur a  180)
+               // ceci peut etre applique une fois pour toute au depart
+               // ensuite calculer l'angle dans le nouveau repare
+               // puis faire une rotation de 90
                x0 = X0 * ((double)a->width / 100);
                x1 = X1 * ((double)a->width / 100);
                y0 = Y0 * ((double)a->height / 100);