summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2016-08-19 12:05:46 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2016-08-19 12:15:31 -0400
commit4d31e7fbbada46f71ac35158665f072488e10411 (patch)
tree45dbe388bf657f7fc03609d43fc2382076bad15f
parent66911485b1071821806f434e56b03cbbae36f304 (diff)
Revert "track/manage size hints for zoomap child objects"
This reverts commit 7b07b03c21a2639feb0435999ad276e1f3514c1f. this seems to have been solving a problem in the wrong way and created map issues in some corner cases ref T4339
-rw-r--r--src/bin/e_zoomap.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/src/bin/e_zoomap.c b/src/bin/e_zoomap.c
index 6ed511b15..682412fc6 100644
--- a/src/bin/e_zoomap.c
+++ b/src/bin/e_zoomap.c
@@ -32,17 +32,6 @@ static void _e_zoomap_smart_clip_set(Evas_Object *obj, Evas_Object *clip);
32static void _e_zoomap_smart_clip_unset(Evas_Object *obj); 32static void _e_zoomap_smart_clip_unset(Evas_Object *obj);
33static void _e_zoomap_smart_init(void); 33static void _e_zoomap_smart_init(void);
34 34
35static void
36_e_zoomap_smart_child_hints(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
37{
38 E_Smart_Data *sd = data;
39 int w, h;
40
41 evas_object_size_hint_min_get(obj, &w, &h);
42 evas_object_size_hint_min_set(sd->smart_obj, w, h);
43 evas_object_resize(sd->smart_obj, w, h);
44}
45
46/* local subsystem globals */ 35/* local subsystem globals */
47static Evas_Smart *_e_smart = NULL; 36static Evas_Smart *_e_smart = NULL;
48 37
@@ -69,8 +58,6 @@ e_zoomap_child_set(Evas_Object *obj, Evas_Object *child)
69 _e_zoomap_smart_child_del_hook); 58 _e_zoomap_smart_child_del_hook);
70 evas_object_event_callback_del(sd->child_obj, EVAS_CALLBACK_RESIZE, 59 evas_object_event_callback_del(sd->child_obj, EVAS_CALLBACK_RESIZE,
71 _e_zoomap_smart_child_resize_hook); 60 _e_zoomap_smart_child_resize_hook);
72 evas_object_event_callback_del(child, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
73 _e_zoomap_smart_child_hints);
74 sd->child_obj = NULL; 61 sd->child_obj = NULL;
75 } 62 }
76 if (child) 63 if (child)
@@ -83,8 +70,6 @@ e_zoomap_child_set(Evas_Object *obj, Evas_Object *child)
83 &sd->child_w, &sd->child_h); 70 &sd->child_w, &sd->child_h);
84 evas_object_event_callback_add(child, EVAS_CALLBACK_DEL, 71 evas_object_event_callback_add(child, EVAS_CALLBACK_DEL,
85 _e_zoomap_smart_child_del_hook, sd); 72 _e_zoomap_smart_child_del_hook, sd);
86 evas_object_event_callback_add(child, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
87 _e_zoomap_smart_child_hints, sd);
88 evas_object_event_callback_add(child, EVAS_CALLBACK_RESIZE, 73 evas_object_event_callback_add(child, EVAS_CALLBACK_RESIZE,
89 _e_zoomap_smart_child_resize_hook, sd); 74 _e_zoomap_smart_child_resize_hook, sd);
90 if (evas_object_visible_get(obj)) evas_object_show(sd->child_obj); 75 if (evas_object_visible_get(obj)) evas_object_show(sd->child_obj);
@@ -290,8 +275,6 @@ _e_zoomap_smart_del(Evas_Object *obj)
290 _e_zoomap_smart_child_del_hook); 275 _e_zoomap_smart_child_del_hook);
291 evas_object_event_callback_del(o, EVAS_CALLBACK_RESIZE, 276 evas_object_event_callback_del(o, EVAS_CALLBACK_RESIZE,
292 _e_zoomap_smart_child_resize_hook); 277 _e_zoomap_smart_child_resize_hook);
293 evas_object_event_callback_del(o, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
294 _e_zoomap_smart_child_hints);
295 evas_object_del(o); 278 evas_object_del(o);
296 } 279 }
297 E_FREE(sd); 280 E_FREE(sd);