summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJinyong Park <j4939.park@samsung.com>2016-07-05 21:03:42 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-07-05 21:06:21 +0900
commit84d48b498cf127edf9e36b0b250fa94117b62e85 (patch)
tree60141deca5214b0c0e7d7a6d0a913587193fad90
parent5bd437fe2747b748e928d46791ec4e5a320df6f8 (diff)
notify: change return value of "theme_apply" function with inner _theme_apply
Summary: notify's theme_apply function return value with eo_do_super(... elm_object_widget_theme_apply) but notify's super class is widget, widget_theme_apply return always ELM_THEME_APPLY_SUCCESS. so, notify's theme_apply function always return ELM_THEME_APPLY_SUCCESS, if it couldn't apply style correctly. notify apply style via _notify_theme_apply function, so that function must decide theme_apply function's return value. Reviewers: herb, singh.amitesh, Hermet, cedric, raster, jpeg Reviewed By: jpeg Differential Revision: https://phab.enlightenment.org/D4130
-rw-r--r--src/lib/elementary/elm_notify.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/elementary/elm_notify.c b/src/lib/elementary/elm_notify.c
index 36d115b195..57d53a80fb 100644
--- a/src/lib/elementary/elm_notify.c
+++ b/src/lib/elementary/elm_notify.c
@@ -19,7 +19,7 @@
19#define MY_CLASS_NAME "Elm_Notify" 19#define MY_CLASS_NAME "Elm_Notify"
20#define MY_CLASS_NAME_LEGACY "elm_notify" 20#define MY_CLASS_NAME_LEGACY "elm_notify"
21 21
22static void 22static Elm_Theme_Apply
23_notify_theme_apply(Evas_Object *obj) 23_notify_theme_apply(Evas_Object *obj)
24{ 24{
25 const char *style = elm_widget_style_get(obj); 25 const char *style = elm_widget_style_get(obj);
@@ -59,7 +59,7 @@ _notify_theme_apply(Evas_Object *obj)
59 position = "center"; 59 position = "center";
60 } 60 }
61 61
62 elm_widget_theme_object_set(obj, sd->notify, "notify", position, style); 62 return elm_widget_theme_object_set(obj, sd->notify, "notify", position, style);
63} 63}
64 64
65/** 65/**
@@ -149,7 +149,7 @@ _elm_notify_elm_widget_theme_apply(Eo *obj, Elm_Notify_Data *sd)
149 149
150 _mirrored_set(obj, elm_widget_mirrored_get(obj)); 150 _mirrored_set(obj, elm_widget_mirrored_get(obj));
151 151
152 _notify_theme_apply(obj); 152 int_ret &= _notify_theme_apply(obj);
153 if (sd->block_events) _block_events_theme_apply(obj); 153 if (sd->block_events) _block_events_theme_apply(obj);
154 154
155 edje_object_scale_set 155 edje_object_scale_set