okra pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=4a2b411287fadf26ee92512d1438a1284fedf435
commit 4a2b411287fadf26ee92512d1438a1284fedf435 Author: Mike Blumenkrantz <[email protected]> Date: Wed Jun 20 11:33:01 2018 -0500 elm_colorselector: fix improperly named API theme parts Summary: API parts require namespacing, these parts have been namespaced with compatibility code added to handle legacy naming Reviewers: cedric, Hermet, devilhorns, stephenmhouston Subscribers: segfaultxavi, Hermet, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D6213 --- data/elementary/themes/edc/elm/colorsel.edc | 3 ++- src/lib/elementary/elm_colorselector.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/data/elementary/themes/edc/elm/colorsel.edc b/data/elementary/themes/edc/elm/colorsel.edc index cb5af47238..610791e6bc 100644 --- a/data/elementary/themes/edc/elm/colorsel.edc +++ b/data/elementary/themes/edc/elm/colorsel.edc @@ -660,7 +660,8 @@ group { name: "elm/colorselector/item/default"; color: 255 255 255 64; } } - part { name: "color_obj"; type: SWALLOW; + alias: "color_obj" "elm.swallow.color_obj"; + part { name: "elm.swallow.color_obj"; type: SWALLOW; clip_to: "clipper"; description { state: "default" 0.0; rel1.offset: 3 3; diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c index 79a318f44b..72d1a040b1 100644 --- a/src/lib/elementary/elm_colorselector.c +++ b/src/lib/elementary/elm_colorselector.c @@ -1796,7 +1796,8 @@ _elm_color_item_efl_object_constructor(Eo *eo_item, Elm_Color_Item_Data *item) (item->color_obj, EVAS_CALLBACK_MOUSE_MOVE, _on_color_moved, item); evas_object_event_callback_add (item->color_obj, EVAS_CALLBACK_MOUSE_UP, _on_color_released, item); - elm_object_part_content_set(VIEW(item), "color_obj", item->color_obj); + if (!elm_layout_content_set(VIEW(item), "elm.swallow.color_obj", item->color_obj)) + elm_layout_content_set(VIEW(item), "color_obj", item->color_obj); _item_sizing_eval(item); evas_object_show(VIEW(item)); --
