rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=0f6d34b13a3be996449a38db634930e50233ae10
commit 0f6d34b13a3be996449a38db634930e50233ae10 Author: Mykyta Biliavskyi <[email protected]> Date: Wed Jul 27 12:02:14 2016 +0300 Tizen theme: update styles for color_class combobox widget. --- data/themes/tizen/widgets/combobox.edc | 166 +++------------------------------ 1 file changed, 14 insertions(+), 152 deletions(-) diff --git a/data/themes/tizen/widgets/combobox.edc b/data/themes/tizen/widgets/combobox.edc index 43d210b..f27b210 100644 --- a/data/themes/tizen/widgets/combobox.edc +++ b/data/themes/tizen/widgets/combobox.edc @@ -444,70 +444,12 @@ group { name: "elm/button/base/combobox_vertical/library"; } group { name: "elm/button/base/combobox_vertical/color_class"; + inherit: "elm/button/base/combobox_vertical/default"; min: 76 24; max: 9999 24; - images { - image: "Tizen general/drop_arrow_down_nor.png" COMP; - image: "Tizen general/drop_arrow_down_sel.png" COMP; - } + images.image: "Property/color_class_img.png" COMP; parts { - part { name: "base"; - type: SPACER; - description { state: "default" 0.0; - max: -1 24; - } - } - part { name: "border"; - type: RECT; - description { state: "default" 0.0; - color: 174 174 174 255; - } - description { state: "focus" 0.0; - inherit: "default" 0.00; - color: 5 140 238 255; - } - } - part { name: "bg"; - type: RECT; - description { state: "default" 0.0; - rel1.offset: 1 1; - rel2.offset: -2 -2; - } - } - rect { "icon_clip"; - desc { "default"; - } - desc { "disabled"; - inherit: "default"; - color: 255 255 255 180; - } - } - rect { "event"; - desc { "default"; - color: 0 0 0 0; - } - desc { "disabled"; - inherit: "default"; - visible: 0; - } - } - part { name: "left.offset"; - type: SPACER; - description { state: "default" 0.0; - align: 0.0 0.0; - min: 10 0; - max: 10 -1; - } - } - part { name: "right.offset"; - type: SPACER; - description { state: "default" 0.0; - align: 1.0 1.0; - min: 20 19; - max: 20 -1; - } - } - part { name: "elm.swallow.content"; + part { name: "elm.swallow.content"; type: SWALLOW; clip_to: "icon_clip"; description { state: "default" 0.0; @@ -515,27 +457,13 @@ group { name: "elm/button/base/combobox_vertical/color_class"; rel1.offset: 5 0; rel2 { relative: 0.0 1.0; - to_x: "right.offset"; + offset: -6 -1; + to_x: "bg.color1"; to_y: "base"; } } } - part { name: "select_line"; - type: IMAGE; - clip_to: "disabler"; - description { state: "default" 0.0; - max: 9 5; - image.normal: "Tizen general/drop_arrow_down_nor.png"; - rel1.to: "right.offset"; - rel2.to: "right.offset"; - } - description { state: "clicked" 0.0; - inherit: "default" 0.00; - max: 8 4; - image.normal: "Tizen general/drop_arrow_down_sel.png"; - } - } - part { name: "bg.color.color1"; + part { name: "bg.color.color1"; type: RECT; description { state: "default" 0.0; color: 142 142 142 255; @@ -637,70 +565,8 @@ group { name: "elm/button/base/combobox_vertical/color_class"; rel2.to: "bg.color3"; } } - part { name: "disabler"; - type: RECT; - description { state: "default" 0.0; - } - description { state: "active" 0.0; - inherit: "default" 0.00; - color: 64 64 64 225; - } - } } - programs { - program { - signal: "mouse,down,1"; source: "event"; - action: SIGNAL_EMIT "elm,action,press" "elm"; - after: "button_click_anim"; - } - program { name: "button_click_anim"; - action: STATE_SET "clicked" 0.0; - target: "base"; - target: "select_line"; - } - program { name: "button_unclick"; - signal: "mouse,up,1"; source: "event"; - action: SIGNAL_EMIT "elm,action,unpress" "elm"; - after: "button_unclick_anim"; - } - program { name: "button_unclick_anim"; - action: STATE_SET "default" 0.0; - target: "base"; - target: "select_line"; - } - program { name: "buttonactivate"; - signal: "elm,anim,activate"; source: "elm"; - action: STATE_SET "clicked" 0.0; - target: "base"; - target: "select_line"; - after: "button_unpressed_anim"; - } - program { name: "button_unpressed_anim"; - action: STATE_SET "default" 0.0; - in: 0.5 0.0; - target: "base"; - target: "select_line"; - } - program { - signal: "mouse,clicked,1"; source: "event"; - action: SIGNAL_EMIT "elm,action,click" "elm"; - } - program { name: "button_state_disabled"; - signal: "elm,state,disabled"; source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "icon_clip"; - target: "event"; - target: "disabler"; - } - program { name: "button_state_enabled"; - signal: "elm,state,enabled"; source: "elm"; - action: STATE_SET "default" 0.0; - target: "icon_clip"; - target: "event"; - target: "disabler"; - } - } -} + } /* TODO: remove scripts, remake hover */ group { name: "elm/hover/base/combobox_vertical/default"; @@ -1045,6 +911,7 @@ group { name: "elm/hover/base/combobox_vertical/default"; group { name: "elm/genlist/base/combobox_vertical/default"; inherit: "elm/scroller/base/default"; alias: "elm/genlist/base/combobox_vertical/library"; + alias: "elm/genlist/base/combobox_vertical/color_class"; alias: "elm/scroller/base/popup/no_inset_shadow"; /* that's for hoversel */ data.item: "focus_highlight" "on"; parts { @@ -1082,18 +949,15 @@ group { name: "elm/genlist/item_compress/default/combobox_vertical/color_class"; repeat_events: 1; description { state: "default" 0.0; color: 85 85 85 255; - rel1 { - offset: 10 0; - } - rel2 { - offset: -11 -1; - } + rel1.offset: 10 0; + rel2.relative: 0 1; + rel2.to_x: "bg.color1"; + rel2.offset: -6 -1; text { font: FN; size: 15; align: 0.0 0.5; - min: 1 1; - ellipsis: -1; + min: 0 1; } } description { state: "hide" 0.0; @@ -1133,9 +997,7 @@ group { name: "elm/genlist/item_compress/default/combobox_vertical/color_class"; max: 11 11; image.normal: "Property/color_class_img.png"; fill.smooth: 0; - rel2 { - offset: -7 -1; - } + rel2.offset: -7 -1; } } part { name: "bg.color2"; --
