From: Youngbok Shin Date: Mon, 31 Oct 2016 11:57:19 +0000 (+0900) Subject: color class: apply color_class parent-child relationship to all widgets X-Git-Tag: submit/tizen/20161101.043805~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F48%2F94548%2F2;p=platform%2Fupstream%2Felementary.git color class: apply color_class parent-child relationship to all widgets @tizen_feature Change-Id: I68e60541998057f628710127def8908b25721d9b --- diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c index 5b9c740..0cd222b 100644 --- a/src/lib/elc_ctxpopup.c +++ b/src/lib/elc_ctxpopup.c @@ -1147,6 +1147,9 @@ _elm_ctxpopup_evas_object_smart_add(Eo *obj, Elm_Ctxpopup_Data *priv) //Background priv->bg = edje_object_add(evas_object_evas_get(obj)); + /* TIZEN_ONLY(20161031): apply color_class parent-child relationship to all widgets */ + _elm_widget_color_class_parent_set(priv->bg, obj); + /* END */ elm_widget_theme_object_set(obj, priv->bg, "ctxpopup", "bg", "default"); edje_object_signal_callback_add (priv->bg, "elm,action,click", "*", _bg_clicked_cb, obj); @@ -1155,6 +1158,9 @@ _elm_ctxpopup_evas_object_smart_add(Eo *obj, Elm_Ctxpopup_Data *priv) //Arrow priv->arrow = edje_object_add(evas_object_evas_get(obj)); + /* TIZEN_ONLY(20161031): apply color_class parent-child relationship to all widgets */ + _elm_widget_color_class_parent_set(priv->arrow, obj); + /* END */ elm_widget_theme_object_set (obj, priv->arrow, "ctxpopup", "arrow", "default"); evas_object_smart_member_add(priv->arrow, obj); diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c index 58a8d51..e2394ee 100644 --- a/src/lib/elc_multibuttonentry.c +++ b/src/lib/elc_multibuttonentry.c @@ -1538,6 +1538,9 @@ _view_init(Evas_Object *obj, Elm_Multibuttonentry_Data *sd) sd->label = edje_object_add(evas_object_evas_get(obj)); if (!sd->label) return; + /* TIZEN_ONLY(20161031): apply color_class parent-child relationship to all widgets */ + _elm_widget_color_class_parent_set(sd->label, obj); + /* END */ elm_widget_theme_object_set (obj, sd->label, "multibuttonentry", "label", elm_widget_style_get(obj)); @@ -1553,6 +1556,9 @@ _view_init(Evas_Object *obj, Elm_Multibuttonentry_Data *sd) sd->entry = elm_entry_add(obj); if (!sd->entry) return; + /* TIZEN_ONLY(20161031): apply color_class parent-child relationship to all widgets */ + _elm_widget_color_class_parent_set(sd->entry, obj); + /* END */ elm_entry_single_line_set(sd->entry, EINA_TRUE); //TIZEN_ONLY(20160425): Entry property set for mobile UX. elm_object_style_set(sd->entry, "multibuttonentry"); @@ -1575,6 +1581,9 @@ _view_init(Evas_Object *obj, Elm_Multibuttonentry_Data *sd) sd->end = edje_object_add(evas_object_evas_get(obj)); if (!sd->end) return; + /* TIZEN_ONLY(20161031): apply color_class parent-child relationship to all widgets */ + _elm_widget_color_class_parent_set(sd->end, obj); + /* END */ elm_widget_theme_object_set //TIZEN_ONLY(20150429): "Closedbutton" name is only for upstream. //(obj, sd->end, "multibuttonentry", "closedbutton", diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c index 35be3ee..703cdd8 100644 --- a/src/lib/elc_naviframe.c +++ b/src/lib/elc_naviframe.c @@ -1337,6 +1337,9 @@ _item_new(Evas_Object *obj, const char *prev_title = prev_it->title_label; prev_btn = _back_btn_new(obj, prev_title); it->auto_pushed_btn = prev_btn; + /* TIZEN_ONLY(20161031): apply color_class parent-child relationship to all widgets */ + _elm_widget_color_class_parent_set(it->auto_pushed_btn, VIEW(it)); + /* END */ } if (prev_btn) diff --git a/src/lib/elc_popup.c b/src/lib/elc_popup.c index 47687f7..ff1b16a 100644 --- a/src/lib/elc_popup.c +++ b/src/lib/elc_popup.c @@ -895,6 +895,9 @@ _create_scroller(Evas_Object *obj) //Scroller sd->scr = elm_scroller_add(sd->tbl); + /* TIZEN_ONLY(20161031): apply color_class parent-child relationship to all widgets */ + _elm_widget_color_class_parent_set(sd->scr, obj); + /* END */ /* TIZEN_ONLY(20160318): Support legacy group and swallow part names if (!sd->scroll) { @@ -1277,6 +1280,9 @@ _content_text_set(Evas_Object *obj, } sd->text_content_obj = elm_label_add(sd->content_area); + /* TIZEN_ONLY(20161031): apply color_class parent-child relationship to all widgets */ + _elm_widget_color_class_parent_set(sd->text_content_obj, obj); + /* END */ snprintf(style, sizeof(style), "popup/%s", elm_widget_style_get(obj)); /* TIZEN_ONLY(20160704): fix label theme problem elm_object_style_set(sd->text_content_obj, style); @@ -1488,6 +1494,9 @@ _action_button_set(Evas_Object *obj, if (!sd->action_area) { sd->action_area = elm_layout_add(sd->main_layout); + /* TIZEN_ONLY(20161031): apply color_class parent-child relationship to all widgets */ + _elm_widget_color_class_parent_set(sd->action_area, obj); + /* END */ evas_object_event_callback_add (sd->action_area, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _size_hints_changed_cb, sd->main_layout); @@ -1831,6 +1840,9 @@ _elm_popup_evas_object_smart_add(Eo *obj, Elm_Popup_Data *priv) snprintf(style, sizeof(style), "popup/%s", elm_widget_style_get(obj)); priv->notify = elm_notify_add(obj); + /* TIZEN_ONLY(20161031): apply color_class parent-child relationship to all widgets */ + _elm_widget_color_class_parent_set(priv->notify, obj); + /* END */ //TIZEN_ONLY(20160629): reorder notify align set elm_notify_align_set(priv->notify, @@ -1881,6 +1893,9 @@ _elm_popup_evas_object_smart_add(Eo *obj, Elm_Popup_Data *priv) evas_object_event_callback_add(priv->notify, EVAS_CALLBACK_RESIZE, _notify_resize_cb, obj); priv->main_layout = elm_layout_add(obj); + /* TIZEN_ONLY(20161031): apply color_class parent-child relationship to all widgets */ + _elm_widget_color_class_parent_set(priv->main_layout, obj); + /* END */ if (!elm_layout_theme_set(priv->main_layout, "popup", "base", elm_widget_style_get(obj))) CRI("Failed to set layout!"); @@ -1899,6 +1914,9 @@ _elm_popup_evas_object_smart_add(Eo *obj, Elm_Popup_Data *priv) (priv->main_layout, "elm,state,action_area,hidden", "elm", _layout_change_cb, NULL); priv->content_area = elm_layout_add(priv->main_layout); + /* TIZEN_ONLY(20161031): apply color_class parent-child relationship to all widgets */ + _elm_widget_color_class_parent_set(priv->content_area, obj); + /* END */ /* TIZEN_ONLY(20160328): Support legacy groups if (!elm_layout_theme_set(priv->content_area, "popup", "content", style)) CRI("Failed to set layout!"); diff --git a/src/lib/elm_calendar.c b/src/lib/elm_calendar.c index 4a7dc65..f37142a 100644 --- a/src/lib/elm_calendar.c +++ b/src/lib/elm_calendar.c @@ -961,6 +961,9 @@ _spinner_buttons_add(Evas_Object *obj, Elm_Calendar_Data *sd) if (!sd->dec_btn_month) { sd->dec_btn_month = elm_button_add(obj); + /* TIZEN_ONLY(20161031): apply color_class parent-child relationship to all widgets */ + _elm_widget_color_class_parent_set(sd->dec_btn_year, obj); + /* END */ elm_button_autorepeat_set(sd->dec_btn_month, EINA_TRUE); elm_button_autorepeat_initial_timeout_set(sd->dec_btn_month, 0.5); elm_button_autorepeat_gap_timeout_set(sd->dec_btn_month, 0.2); @@ -989,6 +992,9 @@ _spinner_buttons_add(Evas_Object *obj, Elm_Calendar_Data *sd) if (!sd->inc_btn_month) { sd->inc_btn_month = elm_button_add(obj); + /* TIZEN_ONLY(20161031): apply color_class parent-child relationship to all widgets */ + _elm_widget_color_class_parent_set(sd->inc_btn_month, obj); + /* END */ elm_button_autorepeat_set(sd->inc_btn_month, EINA_TRUE); elm_button_autorepeat_initial_timeout_set(sd->inc_btn_month, 0.5); elm_button_autorepeat_gap_timeout_set(sd->inc_btn_month, 0.2); @@ -1017,6 +1023,9 @@ _spinner_buttons_add(Evas_Object *obj, Elm_Calendar_Data *sd) if (!sd->dec_btn_year) { sd->dec_btn_year = elm_button_add(obj); + /* TIZEN_ONLY(20161031): apply color_class parent-child relationship to all widgets */ + _elm_widget_color_class_parent_set(sd->dec_btn_year, obj); + /* END */ elm_button_autorepeat_set(sd->dec_btn_year, EINA_TRUE); elm_button_autorepeat_initial_timeout_set(sd->dec_btn_year, 0.5); elm_button_autorepeat_gap_timeout_set(sd->dec_btn_year, 0.2); @@ -1045,6 +1054,9 @@ _spinner_buttons_add(Evas_Object *obj, Elm_Calendar_Data *sd) if (!sd->inc_btn_year) { sd->inc_btn_year = elm_button_add(obj); + /* TIZEN_ONLY(20161031): apply color_class parent-child relationship to all widgets */ + _elm_widget_color_class_parent_set(sd->inc_btn_year, obj); + /* END */ elm_button_autorepeat_set(sd->inc_btn_year, EINA_TRUE); elm_button_autorepeat_initial_timeout_set(sd->inc_btn_year, 0.5); elm_button_autorepeat_gap_timeout_set(sd->inc_btn_year, 0.2); diff --git a/src/lib/elm_datetime.c b/src/lib/elm_datetime.c index 89e53b6..86134df 100644 --- a/src/lib/elm_datetime.c +++ b/src/lib/elm_datetime.c @@ -935,6 +935,9 @@ _elm_datetime_evas_object_smart_add(Eo *obj, Elm_Datetime_Data *priv) { field = priv->field_list + idx; field->item_obj = dt_mod->field_create(priv->mod_data, idx); + /* TIZEN_ONLY(20161031): apply color_class parent-child relationship to all widgets */ + _elm_widget_color_class_parent_set(field->item_obj, obj); + /* END */ } } } diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c index 5553354..0ceb24a 100644 --- a/src/lib/elm_slider.c +++ b/src/lib/elm_slider.c @@ -512,6 +512,9 @@ _popup_add(Elm_Slider_Data *sd, Eo *obj) // XXX popup needs to adapt to theme etc. sd->popup = edje_object_add(evas_object_evas_get(obj)); + /* TIZEN_ONLY(20161031): apply color_class parent-child relationship to all widgets */ + _elm_widget_color_class_parent_set(sd->popup, obj); + /* END */ if (sd->horizontal) _elm_theme_set(elm_widget_theme_get(obj), sd->popup, "slider", "horizontal/popup", elm_widget_style_get(obj)); else diff --git a/src/lib/elm_spinner.c b/src/lib/elm_spinner.c index 53c006e..48bb93a 100644 --- a/src/lib/elm_spinner.c +++ b/src/lib/elm_spinner.c @@ -669,6 +669,9 @@ _toggle_entry(Evas_Object *obj) if (!sd->ent) { sd->ent = elm_entry_add(obj); + /* TIZEN_ONLY(20161031): apply color_class parent-child relationship to all widgets */ + _elm_widget_color_class_parent_set(sd->ent, obj); + /* END */ Eina_Strbuf *buf = eina_strbuf_new(); eina_strbuf_append_printf(buf, "spinner/%s", elm_widget_style_get(obj)); elm_widget_style_set(sd->ent, eina_strbuf_string_get(buf)); @@ -1299,6 +1302,9 @@ _elm_spinner_evas_object_smart_add(Eo *obj, Elm_Spinner_Data *priv) if (sd->button_layout) { priv->inc_button = elm_button_add(obj); + /* TIZEN_ONLY(20161031): apply color_class parent-child relationship to all widgets */ + _elm_widget_color_class_parent_set(priv->inc_button, obj); + /* END */ elm_object_style_set(priv->inc_button, "spinner/increase/default"); eo_do(priv->inc_button, @@ -1308,6 +1314,9 @@ _elm_spinner_evas_object_smart_add(Eo *obj, Elm_Spinner_Data *priv) elm_widget_sub_object_add(obj, priv->inc_button); priv->text_button = elm_button_add(obj); + /* TIZEN_ONLY(20161031): apply color_class parent-child relationship to all widgets */ + _elm_widget_color_class_parent_set(priv->text_button, obj); + /* END */ elm_object_style_set(priv->text_button, "spinner/default"); eo_do(priv->text_button, eo_event_callback_add @@ -1319,6 +1328,9 @@ _elm_spinner_evas_object_smart_add(Eo *obj, Elm_Spinner_Data *priv) elm_widget_sub_object_add(obj, priv->text_button); priv->dec_button = elm_button_add(obj); + /* TIZEN_ONLY(20161031): apply color_class parent-child relationship to all widgets */ + _elm_widget_color_class_parent_set(priv->dec_button, obj); + /* END */ elm_object_style_set(priv->dec_button, "spinner/decrease/default"); eo_do(priv->dec_button,