From 3d570dd8d31fdebe849d828ae762a3bb869c4e73 Mon Sep 17 00:00:00 2001 From: ChunEon Park Date: Sat, 12 Mar 2011 06:36:21 +0000 Subject: [PATCH] elementary/scrollers - added minor exceptios. SVN revision: 57702 --- legacy/elementary/src/lib/elm_scroller.c | 11 +++++++---- legacy/elementary/src/lib/els_scroller.c | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/legacy/elementary/src/lib/elm_scroller.c b/legacy/elementary/src/lib/elm_scroller.c index 941b6caede..7b81478790 100644 --- a/legacy/elementary/src/lib/elm_scroller.c +++ b/legacy/elementary/src/lib/elm_scroller.c @@ -282,9 +282,12 @@ _sizing_eval(Evas_Object *obj) double xw, yw; if (!wd) return; - evas_object_size_hint_min_get(wd->content, &minw, &minh); - evas_object_size_hint_max_get(wd->content, &maxw, &maxh); - evas_object_size_hint_weight_get(wd->content, &xw, &yw); + if (wd->content) + { + evas_object_size_hint_min_get(wd->content, &minw, &minh); + evas_object_size_hint_max_get(wd->content, &maxw, &maxh); + evas_object_size_hint_weight_get(wd->content, &xw, &yw); + } if (wd->scr) { elm_smart_scroller_child_viewport_size_get(wd->scr, &vw, &vh); @@ -300,7 +303,7 @@ _sizing_eval(Evas_Object *obj) else if ((maxh > 0) && (vh > maxh)) vh = maxh; } else if (minh > 0) vh = minh; - evas_object_resize(wd->content, vw, vh); + if (wd->content) evas_object_resize(wd->content, vw, vh); w = -1; h = -1; edje_object_size_min_calc(elm_smart_scroller_edje_object_get(wd->scr), &vmw, &vmh); diff --git a/legacy/elementary/src/lib/els_scroller.c b/legacy/elementary/src/lib/els_scroller.c index 42a2ea9d44..3b6ab717e8 100644 --- a/legacy/elementary/src/lib/els_scroller.c +++ b/legacy/elementary/src/lib/els_scroller.c @@ -1090,6 +1090,7 @@ void elm_smart_scroller_child_viewport_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) { API_ENTRY return; + if (!sd->pan_obj) return; edje_object_calc_force(sd->edje_obj); evas_object_geometry_get(sd->pan_obj, NULL, NULL, w, h); }