notify: change return value of "theme_apply" function with inner _theme_apply 33/78433/2
authorJinyong Park <j4939.park@samsung.com>
Tue, 5 Jul 2016 12:02:25 +0000 (21:02 +0900)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Wed, 6 Jul 2016 06:01:16 +0000 (23:01 -0700)
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.

(this commit is merged on opensource)

Change-Id: I1a25c385ba7d270b2aaf96160258f130e7460b11
Signed-off-by: Jinyong Park <j4939.park@samsung.com>
src/lib/elm_notify.c

index 19e6bf8..8ded207 100644 (file)
@@ -15,7 +15,7 @@
 #define MY_CLASS_NAME "Elm_Notify"
 #define MY_CLASS_NAME_LEGACY "elm_notify"
 
-static void
+static Elm_Theme_Apply
 _notify_theme_apply(Evas_Object *obj)
 {
    const char *style = elm_widget_style_get(obj);
@@ -55,7 +55,7 @@ _notify_theme_apply(Evas_Object *obj)
           position = "center";
      }
 
-   elm_widget_theme_object_set(obj, sd->notify, "notify", position, style);
+   return elm_widget_theme_object_set(obj, sd->notify, "notify", position, style);
 }
 
 /**
@@ -145,7 +145,7 @@ _elm_notify_elm_widget_theme_apply(Eo *obj, Elm_Notify_Data *sd)
 
    _mirrored_set(obj, elm_widget_mirrored_get(obj));
 
-   _notify_theme_apply(obj);
+   int_ret = _notify_theme_apply(obj) & int_ret;
    if (sd->block_events) _block_events_theme_apply(obj);
 
    edje_object_scale_set