From 1f5402e998ff5a16adafa2d05d62ab2be140a62a Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Tue, 7 Apr 2015 15:04:52 +0900 Subject: [PATCH] colorselector,scroller: Check return value of elm_layout_theme_set Fixes: - CID1273968 - CID1291831 --- src/lib/elm_colorselector.c | 4 +++- src/lib/elm_scroller.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c index b8e3eda..650e0c6 100644 --- a/src/lib/elm_colorselector.c +++ b/src/lib/elm_colorselector.c @@ -1585,7 +1585,9 @@ _elm_colorselector_evas_object_smart_add(Eo *obj, Elm_Colorselector_Data *priv) /* setup the color picker */ priv->picker = elm_layout_add(obj); - elm_layout_theme_set(priv->picker, "colorselector", "picker/base", elm_widget_style_get(obj)); + if (!elm_layout_theme_set(priv->picker, "colorselector", "picker/base", elm_widget_style_get(obj))) + CRI("Failed to set layout!"); + evas_object_size_hint_weight_set(priv->picker, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(priv->picker, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_widget_sub_object_add(obj, priv->picker); diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c index a250482..a2cd799 100644 --- a/src/lib/elm_scroller.c +++ b/src/lib/elm_scroller.c @@ -634,7 +634,9 @@ _loop_content_set(Evas_Object *obj, Elm_Scroller_Data *sd, Evas_Object *content) { sd->contents = elm_layout_add(obj); evas_object_smart_member_add(sd->contents, obj); - elm_layout_theme_set(sd->contents, "scroller", "contents", elm_widget_style_get(obj)); + if (!elm_layout_theme_set(sd->contents, "scroller", "contents", elm_widget_style_get(obj))) + CRI("Failed to set layout!"); + evas_object_size_hint_weight_set(sd->contents, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(sd->contents, EVAS_HINT_FILL, EVAS_HINT_FILL); -- 2.7.4