Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/edje

Dir     : e17/libs/edje/src/lib


Modified Files:
        edje_calc.c 


Log Message:


fix min size calc

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_calc.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -3 -r1.67 -r1.68
--- edje_calc.c 12 Sep 2005 09:43:49 -0000      1.67
+++ edje_calc.c 18 Sep 2005 06:01:35 -0000      1.68
@@ -483,6 +483,7 @@
               {
                  int mw = 0, mh = 0;
                  
+                 tw = th = 0;
                  if (!chosen_desc->text.min_x)
                    {
                       evas_object_resize(ep->object, params->w, params->h);
@@ -493,8 +494,14 @@
                  evas_object_textblock2_style_insets_get(ep->object, &ins_l, 
&ins_r, &ins_t, &ins_b);
                  mw = ins_l + tw + ins_r;
                  mh = ins_t + th + ins_b;
-                 if (mw > minw) minw = mw;
-                 if (mh > minh) minh = mh;
+                 if (chosen_desc->text.min_x)
+                   {
+                      if (mw > minw) minw = mw;
+                   }
+                 if (chosen_desc->text.min_y)
+                   {
+                      if (mh > minh) minh = mh;
+                   }
               }
          }
      }




-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP.  Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to