elementary/scrollers - added minor exceptios.

git-svn-id: https://svn.enlightenment.org/svn/e/trunk/elementary@57702 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c
index 941b6ca..7b81478 100644 (file)
--- a/src/lib/elm_scroller.c
+++ b/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/src/lib/els_scroller.c b/src/lib/els_scroller.c
index 42a2ea9..3b6ab71 100644 (file)
--- a/src/lib/els_scroller.c
+++ b/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);
 }