cedric pushed a commit to branch master.
commit 483029a71771b8f288706ab88462a433520a9594
Author: Cedric Bail <[email protected]>
Date: Fri Apr 12 11:23:55 2013 +0900
edje: silence warning by doing explicit conversion.
---
src/lib/edje/edje_load.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c
index 379e648..8591d9f 100644
--- a/src/lib/edje/edje_load.c
+++ b/src/lib/edje/edje_load.c
@@ -1715,6 +1715,7 @@ static void
_edje_object_pack_item_hints_set(Evas_Object *obj, Edje_Pack_Element *it)
{
Evas_Coord w = 0, h = 0, minw, minh;
+ Evas_Aspect_Control mode = EVAS_ASPECT_CONTROL_NONE;
minw = it->min.w;
minh = it->min.h;
@@ -1740,7 +1741,16 @@ _edje_object_pack_item_hints_set(Evas_Object *obj,
Edje_Pack_Element *it)
evas_object_size_hint_padding_set(obj, it->padding.l, it->padding.r,
it->padding.t, it->padding.b);
evas_object_size_hint_align_set(obj, TO_DOUBLE(it->align.x),
TO_DOUBLE(it->align.y));
evas_object_size_hint_weight_set(obj, TO_DOUBLE(it->weight.x),
TO_DOUBLE(it->weight.y));
- evas_object_size_hint_aspect_set(obj, it->aspect.mode, it->aspect.w,
it->aspect.h);
+
+ switch (it->aspect.mode)
+ {
+ case EDJE_ASPECT_CONTROL_NONE: mode = EVAS_ASPECT_CONTROL_NONE; break;
+ case EDJE_ASPECT_CONTROL_NEITHER: mode = EVAS_ASPECT_CONTROL_NEITHER;
break;
+ case EDJE_ASPECT_CONTROL_HORIZONTAL: mode =
EVAS_ASPECT_CONTROL_HORIZONTAL; break;
+ case EDJE_ASPECT_CONTROL_VERTICAL: mode = EVAS_ASPECT_CONTROL_VERTICAL;
break;
+ case EDJE_ASPECT_CONTROL_BOTH: mode = EVAS_ASPECT_CONTROL_BOTH; break;
+ }
+ evas_object_size_hint_aspect_set(obj, mode, it->aspect.w, it->aspect.h);
evas_object_resize(obj, w, h);
}
--
------------------------------------------------------------------------------
Precog is a next-generation analytics platform capable of advanced
analytics on semi-structured data. The platform includes APIs for building
apps and a phenomenal toolset for data science. Developers can use
our toolset for easy data analysis & visualization. Get a free account!
http://www2.precog.com/precogplatform/slashdotnewsletter
