rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=5b6cc8e92e54d4ea94db4afb8410b21de20169a5
commit 5b6cc8e92e54d4ea94db4afb8410b21de20169a5 Author: Vitalii Vorobiov <[email protected]> Date: Mon Jul 4 18:06:40 2016 +0300 combobox style: use right style naming (upstream & TIZEN styles) @fix --- data/themes/default/widgets/combobox.edc | 5 ++++- data/themes/tizen/widgets/combobox.edc | 4 +++- src/bin/ui/property/property_common.c | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/data/themes/default/widgets/combobox.edc b/data/themes/default/widgets/combobox.edc index 407755b..784f0dc 100644 --- a/data/themes/default/widgets/combobox.edc +++ b/data/themes/default/widgets/combobox.edc @@ -584,6 +584,7 @@ group { name: "elm/button/base/combobox_vertical/color_class"; /* TODO: remove scripts, remake hover */ group { name: "elm/hover/base/combobox_vertical/default"; alias: "elm/hover/base/hoversel_vertical/history"; + alias: "elm/hover/base/combobox_vertical/color_class"; data.item: "dismiss" "on"; script { public on_dismiss = 0; @@ -1354,7 +1355,7 @@ group { name: "elm/genlist/base/combobox_vertical/default"; } } -group { name: "elm/genlist/item_compress/color_class/combobox_vertical/default"; +group { name: "elm/genlist/item_compress/default/combobox_vertical/color_class"; data { item: "texts" "elm.text"; item: "contents" "swallow.color1 swallow.color2 swallow.color3"; @@ -1634,6 +1635,7 @@ group { name: "elm/genlist/item_compress/default/combobox_vertical/default"; group { name: "elm/scroller/entry_single/combobox_vertical/default"; alias: "elm/scroller/entry_single/combobox_horizontal/default"; + alias: "elm/scroller/entry_single/combobox_vertical/color_class"; parts { part { name: "elm.swallow.content"; repeat_events: 1; @@ -1648,6 +1650,7 @@ group { name: "elm/scroller/entry_single/combobox_vertical/default"; group { name: "elm/entry/base-single/combobox_vertical/default"; + alias: "elm/entry/base-single/combobox_vertical/color_class"; parts { part { name: "elm.text"; type: TEXTBLOCK; diff --git a/data/themes/tizen/widgets/combobox.edc b/data/themes/tizen/widgets/combobox.edc index 5799f10..7b9ac7d 100644 --- a/data/themes/tizen/widgets/combobox.edc +++ b/data/themes/tizen/widgets/combobox.edc @@ -1372,7 +1372,7 @@ group { name: "elm/genlist/base/combobox_vertical/default"; } } -group { name: "elm/genlist/item_compress/color_class/combobox_vertical/default"; +group { name: "elm/genlist/item_compress/default/combobox_vertical/color_class"; images.image: "color_class_img.png" COMP; data { item: "texts" "elm.text"; @@ -1617,6 +1617,7 @@ group { name: "elm/genlist/item_compress/default/combobox_vertical/default"; group { name: "elm/scroller/entry_single/combobox_vertical/default"; alias: "elm/scroller/entry_single/combobox_horizontal/default"; + alias: "elm/scroller/entry_single/combobox_vertical/color_class"; parts { part { name: "elm.swallow.content"; type: SWALLOW; @@ -1630,6 +1631,7 @@ group { name: "elm/scroller/entry_single/combobox_vertical/default"; group { name: "elm/entry/base-single/combobox_vertical/default"; + alias: "elm/entry/base-single/combobox_vertical/color_class"; parts { part { name: "elm.text"; type: TEXTBLOCK; diff --git a/src/bin/ui/property/property_common.c b/src/bin/ui/property/property_common.c index 76be76c..6dd1245 100644 --- a/src/bin/ui/property/property_common.c +++ b/src/bin/ui/property/property_common.c @@ -322,7 +322,7 @@ _control_create(Property_Attribute *pa, Property_Action *action, Evas_Object *pa case PROPERTY_CONTROL_COMBOBOX_CC: COMBOBOX_ADD(parent, content); itc = elm_genlist_item_class_new(); - itc->item_style = "color_class"; + itc->item_style = "default"; itc->func.text_get = _combobox_text_get; itc->func.content_get = _combobox_cc_content_get; itc->func.del = _combobox_cc_item_del; --
