CEEEEEEEEEDRICCCCCCCCCCCCCCCC!
authorraster <raster>
Tue, 14 Sep 2010 22:32:34 +0000 (22:32 +0000)
committerraster <raster@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Tue, 14 Sep 2010 22:32:34 +0000 (22:32 +0000)
  borked e conf panel. unbork. disable aspect.

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/edje@52273 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

src/lib/edje_calc.c
src/lib/edje_private.h

index 0834f92..c740f43 100644 (file)
@@ -610,8 +610,8 @@ _edje_part_recalc_single_aspect(Edje_Real_Part *ep,
    params->y = TO_INT(ADD(want_y,
                          MUL(SUB(want_h, FROM_INT(params->h)),
                              desc->align.y)));
-
-   params->aspect = apref;
+// not tested enough -> cedric. e's config panel borks. disable.   
+//   params->aspect = apref;
 }
 
 static void
index 423c6e0..7aa5258 100644 (file)
@@ -167,11 +167,12 @@ struct _Edje_Smart_Api
  * ? all unsafe calls that may result in callbacks must be marked and dealt with
  */
 
-typedef enum {
-  EDJE_ASPECT_PREFER_NONE,
-  EDJE_ASPECT_PREFER_VERTICAL,
-  EDJE_ASPECT_PREFER_HORIZONTAL,
-  EDJE_ASPECT_PREFER_BOTH
+typedef enum
+{
+   EDJE_ASPECT_PREFER_NONE,
+   EDJE_ASPECT_PREFER_VERTICAL,
+   EDJE_ASPECT_PREFER_HORIZONTAL,
+   EDJE_ASPECT_PREFER_BOTH
 } Edje_Internal_Aspect;
 
 struct _Edje_Perspective
@@ -1039,7 +1040,7 @@ struct _Edje_Calc_Params
    Edje_Internal_Aspect aspect; // 4
    unsigned char    visible : 1;
    unsigned char    smooth : 1; // 1
-}; // 100
+}; // 96
 
 struct _Edje_Real_Part_Set
 {