rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=006fae2a248991ab009ba20ad463dda43c6c5694
commit 006fae2a248991ab009ba20ad463dda43c6c5694 Author: Vitalii Vorobiov <[email protected]> Date: Wed Jun 29 16:19:33 2016 +0300 tizen combobox: some light click fixes @fix --- data/themes/tizen/widgets/combobox.edc | 45 +++------------------------------- src/bin/ui/property/property_common.c | 1 + 2 files changed, 5 insertions(+), 41 deletions(-) diff --git a/data/themes/tizen/widgets/combobox.edc b/data/themes/tizen/widgets/combobox.edc index 5965dd3..16f907c 100644 --- a/data/themes/tizen/widgets/combobox.edc +++ b/data/themes/tizen/widgets/combobox.edc @@ -284,6 +284,7 @@ group { name: "elm/button/base/combobox_vertical/color_class"; rel2 { relative: 0.0 1.0; offset: -7 -1; + to_x: "select_line"; to_y: "base"; } } @@ -416,6 +417,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/combobox_vertical/color_class"; data.item: "dismiss" "on"; // max_size limits the maximum size of expanded hoversel // when it's scrollable. @@ -604,15 +606,6 @@ group { name: "elm/hover/base/combobox_vertical/default"; } program { name: "hide"; signal: "elm,action,hide"; source: "elm"; - action: STATE_SET "default" 0.0; - transition: DECELERATE 0.5; - target: "base"; - after: "hidefinished"; - } - program { name: "hide_no_animate"; - signal: "elm,action,hide,no_animate"; source: "elm"; - action: STATE_SET "default" 0.0; - target: "base"; after: "hidefinished"; } program { name: "hidefinished"; @@ -1186,7 +1179,7 @@ group { name: "elm/genlist/item_compress/color_class/combobox_vertical/default"; data { item: "texts" "elm.text"; item: "treesize" "20"; - item: "contents" "elm.swallow.icon elm.swallow.end"; + item: "contents" "swallow.color1 swallow.color2 swallow.color3"; item: "stacking" "above"; item: "selectraise" "on"; } @@ -1261,7 +1254,6 @@ group { name: "elm/genlist/item_compress/color_class/combobox_vertical/default"; image.normal: "color_class_img.png"; fill.smooth: 0; rel2 { - relative: 0.0 1.0; offset: -7 -1; } } @@ -1447,31 +1439,14 @@ group { name: "elm/scroller/entry_single/combobox_vertical/default"; group { name: "elm/entry/base-single/combobox_vertical/default"; parts { - part { name: "elm.guide"; - type: TEXTBLOCK; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - rel1.to: "elm.text"; - rel2.to: "elm.text"; - text.style: "eflete_text_guide_style"; - } - description { state: "hidden" 0.0; - inherit: "default" 0.0; - visible: 0; - } - } part { name: "elm.text"; type: TEXTBLOCK; clip_to: "disabler"; mouse_events: 1; + repeat_events: 1; scale: 1; - entry_mode: EDITABLE; cursor_mode: BEFORE; multiline: 0; - source: "elm/entry/selection/default"; - source4: "elm/entry/cursor/default"; - source5: "elm/entry/anchor/default"; description { state: "default" 0.0; text { style: "entry_main_combobox_text"; @@ -1502,18 +1477,6 @@ group { name: "elm/entry/base-single/combobox_vertical/default"; action: STATE_SET "default" 0.0; target: "disabler"; } - program { name: "gdisable"; - signal: "elm,guide,disabled"; - source: "elm"; - action: STATE_SET "hidden" 0.0; - target: "elm.guide"; - } - program { name: "genable"; - signal: "elm,guide,enabled"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.guide"; - } program { name: "focus"; signal: "load"; source: ""; diff --git a/src/bin/ui/property/property_common.c b/src/bin/ui/property/property_common.c index 45622ca..76be76c 100644 --- a/src/bin/ui/property/property_common.c +++ b/src/bin/ui/property/property_common.c @@ -329,6 +329,7 @@ _control_create(Property_Attribute *pa, Property_Action *action, Evas_Object *pa evas_object_data_set(content, "COMMON_ITC", itc); evas_object_smart_callback_add(content, "item,pressed", _combobox_item_pressed_cb, pa); + elm_object_style_set(content, "color_class"); break; case PROPERTY_CONTROL_SPINNER: SPINNER_ADD(parent, content, 0.0, 9999.0, 1.0, true); --
