summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Lima Chaves <glima@profusion.mobi>2013-06-13 18:12:53 -0300
committerGustavo Lima Chaves <glima@profusion.mobi>2013-06-13 18:12:53 -0300
commit358721624ce234ba35659997c3a8e107ba08bd4c (patch)
treeebba81f3301d313bff6c96923f17affa8c10c09d
parent04ad875c1f4568489dcd58d75178d29580f0ba07 (diff)
Backporting b2e044a3c249eac461446cafe4a18f29cc75e835
"Fix elm_scroller_child_size_get() to work all scrollables. My bad on this one, it was never made to act like so since my new widget schema."
-rw-r--r--src/lib/elm_interface_scrollable.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/elm_interface_scrollable.c b/src/lib/elm_interface_scrollable.c
index ded753bb1..0e1578599 100644
--- a/src/lib/elm_interface_scrollable.c
+++ b/src/lib/elm_interface_scrollable.c
@@ -1044,10 +1044,9 @@ _elm_scroll_content_size_get(const Evas_Object *obj,
1044 Evas_Coord *h) 1044 Evas_Coord *h)
1045{ 1045{
1046 ELM_SCROLL_IFACE_DATA_GET_OR_RETURN(obj, sid); 1046 ELM_SCROLL_IFACE_DATA_GET_OR_RETURN(obj, sid);
1047 ELM_PAN_DATA_GET(sid->pan_obj, psd);
1047 1048
1048 if (!sid->content) return; 1049 psd->api->content_size_get(sid->pan_obj, w, h);
1049
1050 evas_object_geometry_get(sid->content, NULL, NULL, w, h);
1051} 1050}
1052 1051
1053static void 1052static void