summaryrefslogtreecommitdiff
path: root/src/lib/edje
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2015-01-07 16:00:59 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2015-01-07 17:23:24 +0900
commite1e1850d0eefd17c0d5742bce5ed1e6e08e9b433 (patch)
tree5df4383cb508351f4f1ee76aab05bb57fec839da /src/lib/edje
parentb601d89f45b8568e981c1a176f06c70a60120b92 (diff)
edje - fix uninitialized coord sizes if swallow obj is invalid
this fixes invalid sizing calcs if shallowed obj is invalid and we cant get geometry etc. @fix
Diffstat (limited to 'src/lib/edje')
-rw-r--r--src/lib/edje/edje_util.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index c2bac199ce..e27f93bafa 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -4954,7 +4954,7 @@ _edje_real_part_swallow_hints_update(Edje_Real_Part *rp)
4954 rp->typedata.swallow->swallow_params.max.h = -1; 4954 rp->typedata.swallow->swallow_params.max.h = -1;
4955 if (eo_isa(rp->typedata.swallow->swallowed_object, EDJE_OBJECT_CLASS)) 4955 if (eo_isa(rp->typedata.swallow->swallowed_object, EDJE_OBJECT_CLASS))
4956 { 4956 {
4957 Evas_Coord w, h; 4957 Evas_Coord w = 0, h = 0;
4958 4958
4959#if 0 4959#if 0
4960 edje_object_size_min_get(rp->typedata.swallow->swallowed_object, &w, &h); 4960 edje_object_size_min_get(rp->typedata.swallow->swallowed_object, &w, &h);
@@ -4969,7 +4969,7 @@ _edje_real_part_swallow_hints_update(Edje_Real_Part *rp)
4969 eo_isa(rp->typedata.swallow->swallowed_object, EVAS_POLYGON_CLASS) || 4969 eo_isa(rp->typedata.swallow->swallowed_object, EVAS_POLYGON_CLASS) ||
4970 eo_isa(rp->typedata.swallow->swallowed_object, EVAS_LINE_CLASS)) 4970 eo_isa(rp->typedata.swallow->swallowed_object, EVAS_LINE_CLASS))
4971 { 4971 {
4972 Evas_Coord w, h; 4972 Evas_Coord w = 0, h = 0;
4973 4973
4974 evas_object_geometry_get(rp->typedata.swallow->swallowed_object, NULL, NULL, &w, &h); 4974 evas_object_geometry_get(rp->typedata.swallow->swallowed_object, NULL, NULL, &w, &h);
4975#if 0 4975#if 0
@@ -4980,8 +4980,8 @@ _edje_real_part_swallow_hints_update(Edje_Real_Part *rp)
4980 rp->typedata.swallow->swallow_params.max.h = h; 4980 rp->typedata.swallow->swallow_params.max.h = h;
4981 } 4981 }
4982 { 4982 {
4983 Evas_Coord w1, h1, w2, h2, aw, ah; 4983 Evas_Coord w1 = 0, h1 = 0, w2 = 0, h2 = 0, aw = 0, ah = 0;
4984 Evas_Aspect_Control am; 4984 Evas_Aspect_Control am = EVAS_ASPECT_CONTROL_NONE;
4985 4985
4986 evas_object_size_hint_min_get(rp->typedata.swallow->swallowed_object, &w1, &h1); 4986 evas_object_size_hint_min_get(rp->typedata.swallow->swallowed_object, &w1, &h1);
4987 evas_object_size_hint_max_get(rp->typedata.swallow->swallowed_object, &w2, &h2); 4987 evas_object_size_hint_max_get(rp->typedata.swallow->swallowed_object, &w2, &h2);