hermet pushed a commit to branch master.
commit 1f3fd49b4511ba4308a433cee9e7488cb61adaae
Author: ChunEon Park <[email protected]>
Date: Mon Aug 12 21:46:36 2013 +0900
elementary/Mapbuf - Ensure that content size calculation is correctly
finished because the mapbuf is willing to block the size calculation forcely.
---
ChangeLog | 13 ++++++++++---
NEWS | 1 +
src/lib/elm_mapbuf.c | 9 +++++++++
3 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 40ff931..b424df7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1536,8 +1536,9 @@
2013-08-09 Cedric Bail
- * Add support for URL in Elm_Image with the following new smart
callback :
- "download,start", "download,progress", "download,done",
"download,error".
+ * Add support for URL in Elm_Image with the following new smart
+ callback : "download,start", "download,progress", "download,done",
+ "download,error".
2013-08-10 ChunEon Park (Hermet)
@@ -1550,4 +1551,10 @@
2013-08-12 Cedric Bail
- * Add URL support to Elm_Photocam with the same callback as URL suport
in Elm_Image.
+ * Add URL support to Elm_Photocam with the same callback as URL suport
+ in Elm_Image.
+
+2013-08-12 ChunEon Park (Hermet)
+
+ * Mapbuf: Ensure that content size calculation is correctly finished
+ because the mapbuf is willing to block the size calculation forcely.
diff --git a/NEWS b/NEWS
index 7cb6a29..7a95670 100644
--- a/NEWS
+++ b/NEWS
@@ -281,6 +281,7 @@ Removals:
* Naviframe: Dont' be popped if the event is freezed and popping is going
on.
* Ctxpopup: Apply current ctxpopup style to the list.
* Popup: Fix the corrupted internal widget tree that caused elm_theme_set()
doesn't work correctly.
+ * Mapbuf: Ensure that content size calculation is correctly finished
because the mapbuf is willing to block the size calculation forcely.
Changes since Elementary 1.0.0:
-------------------------
diff --git a/src/lib/elm_mapbuf.c b/src/lib/elm_mapbuf.c
index ba9f75b..9f4b1e4 100644
--- a/src/lib/elm_mapbuf.c
+++ b/src/lib/elm_mapbuf.c
@@ -51,6 +51,7 @@ _changed_size_hints_cb(void *data,
Evas_Object *obj __UNUSED__,
void *event_info __UNUSED__)
{
+ evas_smart_objects_calculate(e);
_sizing_eval(data);
}
@@ -74,6 +75,10 @@ _elm_mapbuf_smart_sub_object_del(Eo *obj, void *_pd, va_list
*list)
evas_object_event_callback_del_full
(sobj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints_cb,
obj);
+ evas_object_event_callback_del_full(sobj, EVAS_CALLBACK_MOVE,
+ _changed_size_hints_cb, obj);
+ evas_object_event_callback_del_full(sobj, EVAS_CALLBACK_RESIZE,
+ _changed_size_hints_cb, obj);
sd->content = NULL;
_sizing_eval(obj);
}
@@ -281,6 +286,10 @@ _elm_mapbuf_smart_content_set(Eo *obj, void *_pd, va_list
*list)
evas_object_event_callback_add
(content, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints_cb, obj);
+ evas_object_event_callback_add(content, EVAS_CALLBACK_MOVE,
+ _changed_size_hints_cb, obj);
+ evas_object_event_callback_add(content, EVAS_CALLBACK_RESIZE,
+ _changed_size_hints_cb, obj);
}
else
evas_object_color_set(wd->resize_obj, 0, 0, 0, 0);
--
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk
