Changeset 4762

Timestamp:

02/06/11 19:19:06 (2 years ago)

Author:

jylam

Message:

• Almost correct td width handling

Location:

gaycko/trunk

Files:

• src/render/position.c (modified) (3 diffs)
• src/render/renderer.h (modified) (1 diff)
• src/render/table.c (modified) (6 diffs)
• tests/table.html (modified) (1 diff)

gaycko/trunk/src/render/position.c

@@ -27 +27 @@
                 gaycko_get_position(node->children[c], parent);
                 x+=node->children[c]->properties->width;
+                
+                
+                gaycko_fix_table(node->children[c]);
                 if(node->children[c]->properties->width>w) {
                     w = (node->children[c]->properties->width);
                 }
-                gaycko_fix_table(node->children[c]);
                 break;
                 
@@ -100 +102 @@
         y+=node->children[c]->properties->height;
         h+=node->children[c]->properties->height;
-       
     }
     
@@ -108 +109 @@
 
 
-
 void gaycko_add_node_x(gNode *node, unsigned int add) {
 
     unsigned int e = 0;
     for(e = 0 ; e < node->children_count; e++) {
-                node->children[e]->properties->x +=add;
+                //gaycko_add_node_x(node->children[e], add);
+        //gaycko_add_node_x(node->children[e], add);
+        node->children[e]->properties->width += add;
+        node->children[e]->properties->x += add;        
     }
+    node->properties->x += add;
+    
 }
 

gaycko/trunk/src/render/renderer.h

@@ -28 +28 @@
 void gaycko_fix_table(gNode *table);
 void gaycko_fix_tr(gNode *tr);
-unsigned int gaycko_get_td_width(gNode *tr, unsigned int td_index);
-void gaycko_set_td_width(gNode *tr, unsigned td_index, unsigned int width);
+unsigned int gaycko_get_trtd_width(gNode *tr, unsigned int td_index);
+unsigned int gaycko_get_node_width(gNode *td);
+void gaycko_set_trtd_width(gNode *tr, unsigned td_index, unsigned int width);
+unsigned int gaycko_get_tr_width(gNode *tr);
 void gaycko_add_node_x(gNode *node, unsigned int add);
 

gaycko/trunk/src/render/table.c

@@ -29 +29 @@
     /* Scan TD's and set each correspondants to the max width */
     unsigned int td = 0;
+    
     for(td = 0; td < last_tr->specific.tr->td_count; td++) {
         unsigned int biggest_td = 0;
         
+        /* Find widest at a given X offset */
         for(e = 0 ; e < table->children_count; e++) {
             if(table->children[e]->type == ELEM_TR) {
-                unsigned int td_width = gaycko_get_td_width(table->children[e], td);
+                unsigned int td_width = gaycko_get_trtd_width(table->children[e], td);
                 if(biggest_td < td_width) {
                     biggest_td = td_width;
@@ -40 +42 @@
             }
         }
+        /* Set the others's width to the widest one */
         for(e = 0 ; e < table->children_count; e++) {
             if(table->children[e]->type == ELEM_TR) {
-                gaycko_set_td_width(table->children[e], td, biggest_td);
+                gaycko_set_trtd_width(table->children[e], td, biggest_td);
             }
         }
     }
+    
+    table->properties->width = gaycko_get_tr_width(last_tr);
+    printf("Table %d wide\n", table->properties->width);
+    
 }
+
+
+
+unsigned int gaycko_get_tr_width(gNode *tr) {
+        unsigned int w = 0, td = 0;
+    
+    for(td = 0 ; td < tr->children_count; td++) {
+        if(tr->children[td]->type == ELEM_TD) {
+            unsigned int tw = gaycko_get_node_width(tr->children[td]);
+            w +=  tw;
+            printf("TD width %d\n", tw);
+        }
+    }
+    printf("So TR width %d\n", w);
+    return w;
+}
+
+unsigned int gaycko_get_node_width(gNode *td) {
+    unsigned int e = 0;
+        unsigned int w = 0;
+    for(e = 0 ; e < td->children_count; e++) {
+        w+=td->properties->width;
+    }
+    return w;
+}
+
 
 void gaycko_fix_tr(gNode *tr) {
@@ -59 +92 @@
 }    
 
-unsigned int gaycko_get_td_width(gNode *tr, unsigned int td_index) {
+unsigned int gaycko_get_trtd_width(gNode *tr, unsigned int td_index) {
     unsigned int e = 0;
     unsigned int td = 0;
@@ -71 +104 @@
 }
 
-void gaycko_set_td_width(gNode *tr, unsigned td_index, unsigned int width) {
+void gaycko_set_trtd_width(gNode *tr, unsigned td_index, unsigned int width) {
     unsigned int e = 0;
     unsigned int td = 0;
@@ -80 +113 @@
             if(td == td_index) {
                 add_width = width - tr->children[e]->properties->width;
-            } else {
+            } 
+            td++;
+        }
+    }
+        td = 0;
+    for(e = 0 ; e < tr->children_count; e++) {
+        if(tr->children[e]->type == ELEM_TD) {
+            if(td == td_index) {
+                
+            } else if(td > td_index){
+                tr->children[e]->properties->width = width;
                 gaycko_add_node_x(tr->children[e], add_width);
             }
@@ -86 +129 @@
         }
     }
+    
+    
 }
+

gaycko/trunk/tests/table.html

@@ -4 +4 @@
 Du texte<br/>
 <table width=50%>
-<tr><td> Cell1 </td><td> Cell2</td></tr>
-<tr><td> Cell3 plus grande</td><td> Cell4</td></tr>
+<tr><td> Cell1 </td><td> Cell2</td><td>Cell3 large</td></tr>
+<tr><td> Cell4 wide too</td><td> Cell5</td><td>Cell6</td></tr>
 </table>
 </body>