Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir     : e16/e/src


Modified Files:
        dialog.c 


Log Message:
Fix dialog layout bug.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/dialog.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -3 -r1.135 -r1.136
--- dialog.c    30 Oct 2005 19:40:49 -0000      1.135
+++ dialog.c    31 Oct 2005 20:46:08 -0000      1.136
@@ -1236,18 +1236,20 @@
                for (i = 0; i < di->item.table.num_items; i++)
                  {
                     DItem              *dii;
-                    int                 w, h, j, csum = 0;
+                    int                 w, h, j, ww;
 
                     dii = di->item.table.items[i];
                     w = dii->w + (dii->padding.left + dii->padding.right);
                     h = dii->h + (dii->padding.top + dii->padding.bottom);
+                    ww = 0;
                     for (j = 0; j < dii->col_span; j++)
-                       csum += col_size[c + j];
-                    if (w > csum)
+                       ww += col_size[c + j];
+                    if (w > ww)
                       {
+                         ww = (w + dii->col_span - 1) / dii->col_span;
                          for (j = 0; j < dii->col_span; j++)
-                            col_size[c + j] =
-                               (w + dii->col_span - 1) / dii->col_span;
+                            if (col_size[c + j] < ww)
+                               col_size[c + j] = ww;
                       }
                     if (h > row_size[r])
                        row_size[r] = h;




-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to