summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--NEWS2
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c15
3 files changed, 20 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 3b937615d0..aaf58a1f39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
12013-10-15 ChunEon Park (Hermet) 12013-10-15 ChunEon Park (Hermet)
2 2
3 * Fixed the map surface to be updated properly. By tranversing the
4 whole of the map target's tree, it decides to update the map
5 surface to be redrawn if one of the objects is changed except the
6 clipper itself.
7
82013-10-15 ChunEon Park (Hermet)
9
3 * Fixed memory leak in the edje map color transition. 10 * Fixed memory leak in the edje map color transition.
4 11
52013-10-11 Carsten Haitzler (The Rasterman) 122013-10-11 Carsten Haitzler (The Rasterman)
diff --git a/NEWS b/NEWS
index 9693b0d989..000fe0daeb 100644
--- a/NEWS
+++ b/NEWS
@@ -356,6 +356,8 @@ Fixes:
356 - Skip the map rendering if all points are transparent. 356 - Skip the map rendering if all points are transparent.
357 - Evas bidi: Fixed a bug causing BiDi not to work in some cases. 357 - Evas bidi: Fixed a bug causing BiDi not to work in some cases.
358 - Evas textblock: fixed an issue with markup_get and markup_to_utf8 behaving differently (markup_get was misbehaving). 358 - Evas textblock: fixed an issue with markup_get and markup_to_utf8 behaving differently (markup_get was misbehaving).
359 - Fixed the map surface to be updated properly. By tranversing the whole of the map target's tree, it decides to update the map surface to be redrawn if one of the objects is changed except the clipper itself.
360
359 * Ecore: 361 * Ecore:
360 - Don't leak fd on exec. 362 - Don't leak fd on exec.
361 - Fix fd handler increase issue when ecore_pipe_add/del is called repeatedly. 363 - Fix fd handler increase issue when ecore_pipe_add/del is called repeatedly.
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index 8f156c0088..dc3ae1103f 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -1221,13 +1221,15 @@ _smart_members_changed_check(Evas_Object *eo_obj, Evas_Object_Protected_Data *ob
1221{ 1221{
1222 Evas_Object_Protected_Data *o2; 1222 Evas_Object_Protected_Data *o2;
1223 1223
1224 if (!obj->changed) return EINA_FALSE;
1225 if (!obj->smart.smart) return EINA_TRUE;
1226
1227 if (!evas_object_is_visible(eo_obj, obj) && 1224 if (!evas_object_is_visible(eo_obj, obj) &&
1228 !evas_object_was_visible(eo_obj, obj)) 1225 !evas_object_was_visible(eo_obj, obj))
1229 return EINA_FALSE; 1226 return EINA_FALSE;
1230 1227
1228 if (!obj->smart.smart)
1229 {
1230 if (obj->changed && !obj->clip.clipees) return EINA_TRUE;
1231 return EINA_FALSE;
1232 }
1231 if (_evas_render_has_map(eo_obj, obj)) 1233 if (_evas_render_has_map(eo_obj, obj))
1232 { 1234 {
1233 if (((obj->changed_pchange) && (obj->changed_map)) || 1235 if (((obj->changed_pchange) && (obj->changed_map)) ||
@@ -1246,7 +1248,12 @@ evas_object_smart_changed_get(Evas_Object *eo_obj)
1246 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1248 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS);
1247 Evas_Object_Protected_Data *o2; 1249 Evas_Object_Protected_Data *o2;
1248 1250
1249 if (!obj->is_smart) return obj->changed; 1251 if (!obj->is_smart)
1252 {
1253 if (obj->changed && !obj->clip.clipees) return EINA_TRUE;
1254 else return EINA_FALSE;
1255 }
1256
1250 if (obj->changed_color) return EINA_TRUE; 1257 if (obj->changed_color) return EINA_TRUE;
1251 1258
1252 EINA_INLIST_FOREACH(evas_object_smart_members_get_direct(eo_obj), o2) 1259 EINA_INLIST_FOREACH(evas_object_smart_members_get_direct(eo_obj), o2)