ctxpopup: apply color_class parent-child relationship

 # dependency
   - efl-theme-tizen-mobile : Ic77c6c55736397b4acc19f891e5dde345a917a79

Change-Id: I4a831535a738a35a7203df5e8cc57578fe1507f7
Signed-off-by: Jinyong Park <j4939.park@samsung.com>

diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index faf14d757bf84dca27299f499d9f71493af28e8d..dcba83f3afd6d6dae38f22951f94faf97f52f1a9 100644 (file)
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -851,6 +851,9 @@ EAPI void elm_entry_extension_module_data_get(Evas_Object *obj, Elm_Entry_Extens
    ext_mod->cbhm_proxy = sd->cbhm_proxy;
 #endif
 //
+   //TIZEN_ONLY(20161102): Add entry_edje to set color class parent relation to copypaste popup
+   ext_mod->entry_edje = sd->entry_edje;
+   //
 }
 /////////////////////////////////////////////////////////////////
 // TIZEN ONLY : END

diff --git a/src/lib/elm_module_priv.h b/src/lib/elm_module_priv.h
index 9b8d1bc10968bbf9a0b5cb505f34ad15dfe146b6..7cf28a5b715a6c4dfb89655197d61584968d345a 100644 (file)
--- a/src/lib/elm_module_priv.h
+++ b/src/lib/elm_module_priv.h
@@ -48,6 +48,9 @@ struct _Elm_Entry_Extension_data
 #ifdef HAVE_ELEMENTARY_WAYLAND
    Eldbus_Proxy *cbhm_proxy;
 #endif
+   //TIZEN_ONLY(20161102): Add entry_edje to set color class parent relation to copypaste popup
+   Evas_Object *entry_edje;
+   //
 };
 
 void elm_entry_extension_module_data_get(Evas_Object *obj,Elm_Entry_Extension_data *ext_mod);

diff --git a/src/mobile_lib/elc_ctxpopup.c b/src/mobile_lib/elc_ctxpopup.c
index f67a4bd39a00e03b9d4dd00c0f60a1abf3d0ad13..02bb12094c1adcb76c2a230335ef4272fb974379 100644 (file)
--- a/src/mobile_lib/elc_ctxpopup.c
+++ b/src/mobile_lib/elc_ctxpopup.c
@@ -1384,7 +1384,7 @@ _elm_ctxpopup_elm_widget_theme_apply(Eo *obj, Elm_Ctxpopup_Data *sd)
 
    if (sd->scr)
      {
-        elm_object_style_set(sd->scr, "list_effect");
+        elm_layout_theme_set(sd->scr, "scroller", "ctxpopup", elm_widget_style_get(obj));
 
         if (sd->horizontal)
           elm_scroller_policy_set(sd->scr, ELM_SCROLLER_POLICY_AUTO, ELM_SCROLLER_POLICY_OFF);
@@ -1749,8 +1749,9 @@ _list_new(Evas_Object *obj)
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
    //scroller
    sd->scr = elm_scroller_add(obj);
-   elm_object_style_set(sd->scr, "list_effect");
+   elm_layout_theme_set(sd->scr, "scroller", "ctxpopup", elm_widget_style_get(obj));
    evas_object_size_hint_align_set(sd->scr, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   _elm_widget_color_class_parent_set(sd->scr, obj);
 
    if (sd->horizontal)
      elm_scroller_policy_set(sd->scr, ELM_SCROLLER_POLICY_AUTO, ELM_SCROLLER_POLICY_OFF);
@@ -1803,11 +1804,13 @@ _elm_ctxpopup_evas_object_smart_add(Eo *obj, Elm_Ctxpopup_Data *priv)
      (priv->bg, "elm,action,click", "", _bg_clicked_cb, obj);
    evas_object_smart_member_add(priv->bg, obj);
    evas_object_stack_below(priv->bg, wd->resize_obj);
+   _elm_widget_color_class_parent_set(priv->bg, obj);
 
    //Arrow
    priv->arrow = edje_object_add(evas_object_evas_get(obj));
    elm_widget_theme_object_set
      (obj, priv->arrow, "ctxpopup", "arrow", "default");
+   _elm_widget_color_class_parent_set(priv->arrow, obj);
 
    priv->dir_priority[0] = ELM_CTXPOPUP_DIRECTION_UP;
    priv->dir_priority[1] = ELM_CTXPOPUP_DIRECTION_LEFT;
@@ -1829,6 +1832,7 @@ _elm_ctxpopup_evas_object_smart_add(Eo *obj, Elm_Ctxpopup_Data *priv)
    else
      elm_widget_theme_object_set(obj, priv->layout, "ctxpopup", "layout", "default");
    evas_object_smart_member_add(priv->layout, obj);
+   _elm_widget_color_class_parent_set(priv->layout, obj);
 
    edje_object_signal_callback_add
      (priv->layout, "elm,action,hide,finished", "", _hide_finished_cb, obj);
@@ -2138,6 +2142,7 @@ _elm_ctxpopup_item_append(Eo *obj, Elm_Ctxpopup_Data *sd, const char *label, Eva
    elm_box_pack_end(sd->box, focus_bt);
    sd->items = eina_list_append(sd->items, item);
    item->btn = focus_bt;
+   _elm_widget_color_class_parent_set(VIEW(item), obj);
 
    sd->dir = ELM_CTXPOPUP_DIRECTION_UNKNOWN;
 

diff --git a/src/modules/copypasteUI_ctxpopup/copypaste.c b/src/modules/copypasteUI_ctxpopup/copypaste.c
index 2a27ebaf0cc37bb7a8dc084c7591ba40c8839778..74a83f59e0037000f904ae7b53954331bf46f025 100644 (file)
--- a/src/modules/copypasteUI_ctxpopup/copypaste.c
+++ b/src/modules/copypasteUI_ctxpopup/copypaste.c
@@ -1319,6 +1319,7 @@ obj_longpress(Evas_Object *obj)
              evas_object_smart_callback_add(ext_mod->popup, "dismissed", _ctxpopup_dismissed_cb, obj);
              evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL, _entry_del_cb, ext_mod->popup);
              evas_object_event_callback_add(obj, EVAS_CALLBACK_HIDE, _entry_hide_cb, ext_mod->popup);
+             edje_object_color_class_parent_set(elm_layout_edje_get(ext_mod->popup), ext_mod->entry_edje);
           }
         else
           {