summaryrefslogtreecommitdiff
path: root/legacy/elementary
diff options
context:
space:
mode:
authorChunEon Park <hermet@hermet.pe.kr>2013-08-12 21:46:36 +0900
committerChunEon Park <hermet@hermet.pe.kr>2013-08-12 21:46:36 +0900
commita4cb3c27e0f14741caa5670f00c729d5de88ab18 (patch)
tree34948de7bfc0edf1025af5b8c06e5adf33869ca3 /legacy/elementary
parent90d7174eb8961db25092d079d84f2da1d8f4f037 (diff)
elementary/Mapbuf - Ensure that content size calculation is correctly finished because the mapbuf is willing to block the size calculation forcely.
Diffstat (limited to 'legacy/elementary')
-rw-r--r--legacy/elementary/ChangeLog13
-rw-r--r--legacy/elementary/NEWS1
-rw-r--r--legacy/elementary/src/lib/elm_mapbuf.c9
3 files changed, 20 insertions, 3 deletions
diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog
index 40ff9316ae..b424df7e81 100644
--- a/legacy/elementary/ChangeLog
+++ b/legacy/elementary/ChangeLog
@@ -1536,8 +1536,9 @@
1536 1536
15372013-08-09 Cedric Bail 15372013-08-09 Cedric Bail
1538 1538
1539 * Add support for URL in Elm_Image with the following new smart callback : 1539 * Add support for URL in Elm_Image with the following new smart
1540 "download,start", "download,progress", "download,done", "download,error". 1540 callback : "download,start", "download,progress", "download,done",
1541 "download,error".
1541 1542
15422013-08-10 ChunEon Park (Hermet) 15432013-08-10 ChunEon Park (Hermet)
1543 1544
@@ -1550,4 +1551,10 @@
1550 1551
15512013-08-12 Cedric Bail 15522013-08-12 Cedric Bail
1552 1553
1553 * Add URL support to Elm_Photocam with the same callback as URL suport in Elm_Image. 1554 * Add URL support to Elm_Photocam with the same callback as URL suport
1555 in Elm_Image.
1556
15572013-08-12 ChunEon Park (Hermet)
1558
1559 * Mapbuf: Ensure that content size calculation is correctly finished
1560 because the mapbuf is willing to block the size calculation forcely.
diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS
index 7cb6a297d1..7a956701cb 100644
--- a/legacy/elementary/NEWS
+++ b/legacy/elementary/NEWS
@@ -281,6 +281,7 @@ Removals:
281 * Naviframe: Dont' be popped if the event is freezed and popping is going on. 281 * Naviframe: Dont' be popped if the event is freezed and popping is going on.
282 * Ctxpopup: Apply current ctxpopup style to the list. 282 * Ctxpopup: Apply current ctxpopup style to the list.
283 * Popup: Fix the corrupted internal widget tree that caused elm_theme_set() doesn't work correctly. 283 * Popup: Fix the corrupted internal widget tree that caused elm_theme_set() doesn't work correctly.
284 * Mapbuf: Ensure that content size calculation is correctly finished because the mapbuf is willing to block the size calculation forcely.
284 285
285Changes since Elementary 1.0.0: 286Changes since Elementary 1.0.0:
286------------------------- 287-------------------------
diff --git a/legacy/elementary/src/lib/elm_mapbuf.c b/legacy/elementary/src/lib/elm_mapbuf.c
index ba9f75bb29..9f4b1e4269 100644
--- a/legacy/elementary/src/lib/elm_mapbuf.c
+++ b/legacy/elementary/src/lib/elm_mapbuf.c
@@ -51,6 +51,7 @@ _changed_size_hints_cb(void *data,
51 Evas_Object *obj __UNUSED__, 51 Evas_Object *obj __UNUSED__,
52 void *event_info __UNUSED__) 52 void *event_info __UNUSED__)
53{ 53{
54 evas_smart_objects_calculate(e);
54 _sizing_eval(data); 55 _sizing_eval(data);
55} 56}
56 57
@@ -74,6 +75,10 @@ _elm_mapbuf_smart_sub_object_del(Eo *obj, void *_pd, va_list *list)
74 evas_object_event_callback_del_full 75 evas_object_event_callback_del_full
75 (sobj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints_cb, 76 (sobj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints_cb,
76 obj); 77 obj);
78 evas_object_event_callback_del_full(sobj, EVAS_CALLBACK_MOVE,
79 _changed_size_hints_cb, obj);
80 evas_object_event_callback_del_full(sobj, EVAS_CALLBACK_RESIZE,
81 _changed_size_hints_cb, obj);
77 sd->content = NULL; 82 sd->content = NULL;
78 _sizing_eval(obj); 83 _sizing_eval(obj);
79 } 84 }
@@ -281,6 +286,10 @@ _elm_mapbuf_smart_content_set(Eo *obj, void *_pd, va_list *list)
281 evas_object_event_callback_add 286 evas_object_event_callback_add
282 (content, EVAS_CALLBACK_CHANGED_SIZE_HINTS, 287 (content, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
283 _changed_size_hints_cb, obj); 288 _changed_size_hints_cb, obj);
289 evas_object_event_callback_add(content, EVAS_CALLBACK_MOVE,
290 _changed_size_hints_cb, obj);
291 evas_object_event_callback_add(content, EVAS_CALLBACK_RESIZE,
292 _changed_size_hints_cb, obj);
284 } 293 }
285 else 294 else
286 evas_object_color_set(wd->resize_obj, 0, 0, 0, 0); 295 evas_object_color_set(wd->resize_obj, 0, 0, 0, 0);