diff options
author | divyesh purohit <div.purohit@samsung.com> | 2016-01-04 15:22:46 -0800 |
---|---|---|
committer | Cedric BAIL <cedric@osg.samsung.com> | 2016-01-04 15:24:49 -0800 |
commit | b4f8b8c0c66095730d4436db3987c3fad34aec95 (patch) | |
tree | 34f3e64220928f7c9732769f603044e1ebb9c4bc /data | |
parent | 8692c32417c61a5d3297f35687d44fc6ed1e1747 (diff) | |
download | elementary-b4f8b8c0c66095730d4436db3987c3fad34aec95.tar.gz |
combobox: add new widget.
Summary:
Combobox is a combinational widget of a drop-down list and single line entry.
Based on the text entered in the entry, the list items are filtered accordingly.
Signed-Off By: Cedric Bail <cedric.bail@free.fr>
Signed-Off By: Divyesh Purohit <div.purohit@samsung.com>
Test Plan: test_combobox.c is added to elementary test
Reviewers: raster, shilpasingh, cedric, jpeg, stefan_schmidt
Reviewed By: raster, shilpasingh, cedric
Subscribers: SanghyeonLee, shashank0990, singh.amitesh, tasn, raster, seoz, poornima.srinivasan, rajeshps, govi
Differential Revision: https://phab.enlightenment.org/D2537
Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
Diffstat (limited to 'data')
-rw-r--r-- | data/themes/edc/elm/button.edc | 299 | ||||
-rw-r--r-- | data/themes/edc/elm/hover.edc | 4 |
2 files changed, 303 insertions, 0 deletions
diff --git a/data/themes/edc/elm/button.edc b/data/themes/edc/elm/button.edc index 2134d41e3..9dd9f6186 100644 --- a/data/themes/edc/elm/button.edc +++ b/data/themes/edc/elm/button.edc @@ -1712,3 +1712,302 @@ group { name: "elm/button/base/hoversel_horizontal_entry/default"; } } /******************* SPINNER BUTTONS STYLES END **********************/ +group { name: "elm/button/base/combobox_vertical/default"; + alias: "elm/button/base/combobox_vertical/entry"; + alias: "elm/button/base/combobox_horizontal/default"; + alias: "elm/button/base/combobox_horizontal/entry"; + + images.image: "button_normal.png" COMP; + images.image: "button_clicked.png" COMP; + images.image: "vertical_separated_bar_glow.png" COMP; + parts { + image { "base"; nomouse; + desc { "default"; + image.normal: "button_normal.png"; + image.border: 4 4 3 5; + image.middle: SOLID; + rel1.offset: -1 0; + rel2.offset: 0 1; + fill.smooth: 0; + } + desc { "clicked"; + inherit: "default"; + image.normal: "button_clicked.png"; + image.border: 5 5 4 6; + } + } + rect { "icon_clip"; + desc { "default"; + } + desc { "disabled"; + inherit: "default"; + color: 255 255 255 64; + } + } + rect { "event"; + desc { "default"; + color: 0 0 0 0; + } + desc { "disabled"; + inherit: "default"; + visible: 0; + } + } + swallow { "elm.swallow.content"; + clip_to: "icon_clip"; + desc { "default"; + fixed: 0 0; + align: 0.5 0.5; + rel1.offset: 6 5; + rel1.to: "base"; + rel2.relative: 0.0 1.0; + rel2.offset: -3 -8; + rel2.to: "select_line"; + visible: 1; + } + } + image { "select_line"; nomouse; + desc { "default"; + fixed: 1 1; + align: 1.0 0.5; + min: 15 10; + rel1.to: "base"; + rel1.relative: 1.0 0.0; + rel1.offset: 1 -3; + rel2.to: "base"; + rel2.offset: 1 0; + image.normal: "vertical_separated_bar_glow.png"; + image.border: 7 7 7 7; + fill.smooth : 0; + } + desc { "clicked"; + inherit: "default"; + rel1.offset: 0 -2; + rel2.offset: 0 -1; + } + } + } + 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"; + } + program { name: "button_state_enabled"; + signal: "elm,state,enabled"; source: "elm"; + action: STATE_SET "default" 0.0; + target: "icon_clip"; + target: "event"; + } + } +} + +group { name: "elm/button/base/combobox_vertical_entry/default"; + alias: "elm/button/base/combobox_vertical_entry/entry"; + images.image: "vgrad_med_dark.png" COMP; + images.image: "bevel_horiz_out.png" COMP; + images.image: "shadow_rounded_horiz.png" COMP; + images.image: "shine.png" COMP; + + parts { + image { "shadow"; nomouse; + desc { "default"; + fixed: 1 1; + image.normal: "shadow_rounded_horiz.png"; + image.border: 0 0 9 9; + rel1.to: "base"; + rel1.offset: 0 -4; + rel2.to: "base"; + rel2.offset: -1 5; + fill.smooth: 0; + visible: 0; + } + desc { "clicked"; + inherit: "default"; + visible: 1; + } + } + image { "base"; nomouse; + desc { "default"; + fixed: 1 1; + rel1.offset: -6 0; + image.normal: "vgrad_med_dark.png"; + fill.smooth: 0; + TILED_HORIZ(120) + visible: 0; + } + desc { "clicked"; + inherit: "default"; + visible: 1; + } + } + rect { "icon_clip"; + desc { "default"; + } + desc { "disabled"; + inherit: "default"; + color: 255 255 255 64; + } + } + image { "bevel"; nomouse; + desc { "default"; + fixed: 1 1; + image.normal: "bevel_horiz_out.png"; + image.border: 0 0 2 2; + image.middle: 0; + fill.smooth: 0; + visible: 0; + } + desc { "clicked"; + inherit: "default"; + visible: 1; + } + } + image { "shine"; nomouse; + desc { "default"; + fixed: 1 1; + rel1.to: "base"; + rel1.offset: 0 -2; + rel2.to: "base"; + rel2.relative: 1.0 0.0; + rel2.offset: -1 2; + image.normal: "shine.png"; + visible: 0; + FIXED_SIZE(69, 5) + } + desc { "clicked"; + inherit: "default"; + visible: 1; + } + } + rect { name: "event"; + desc { "default"; + color: 0 0 0 0; + } + desc { "disabled"; + inherit: "default"; + visible: 0; + } + } + swallow { "elm.swallow.content"; nomouse; + clip_to: "icon_clip"; + desc { "default"; + fixed: 1 0; + align: 0.0 0.5; + rel1.offset: 6 5; + rel1.to: "base"; + rel2.relative: 0.0 1.0; + rel2.offset: 6 -8; + rel2.to: "base"; + visible: 0; + } + desc { "visible"; + inherit: "default"; + fixed: 1 0; + aspect: 1.0 1.0; + visible: 1; + } + desc { "icononly"; + inherit: "default"; + fixed: 0 0; + align: 0.5 0.5; + rel2.relative: 1.0 1.0; + rel2.offset: -7 -8; + visible: 1; + } + } + } + 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: "shadow"; + target: "base"; + target: "shine"; + } + 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: "shadow"; + target: "base"; + target: "shine"; + } + program { name: "buttonactivate"; + signal: "elm,anim,activate"; source: "elm"; + action: STATE_SET "clicked" 0.0; + target: "shadow"; + target: "base"; + target: "shine"; + after: "button_unpressed_anim"; + } + program { name: "button_unpressed_anim"; + action: STATE_SET "default" 0.0; + in: 0.5 0.0; + target: "shadow"; + target: "base"; + target: "shine"; + } + 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: "event"; + target: "icon_clip"; + } + program { name: "button_state_enabled"; + signal: "elm,state,enabled"; source: "elm"; + action: STATE_SET "default" 0.0; + target: "event"; + target: "icon_clip"; + } + } +} diff --git a/data/themes/edc/elm/hover.edc b/data/themes/edc/elm/hover.edc index 8a7ed497f..75ea8138c 100644 --- a/data/themes/edc/elm/hover.edc +++ b/data/themes/edc/elm/hover.edc @@ -439,6 +439,8 @@ group { name: "elm/hover/base/popout"; group { name: "elm/hover/base/hoversel_vertical/default"; alias: "elm/hover/base/hoversel_vertical/entry"; + alias: "elm/hover/base/combobox_vertical/entry"; + alias: "elm/hover/base/combobox_vertical/default"; images.image: "button_normal.png" COMP; images.image: "vertical_separated_bar_glow.png" COMP; data.item: "dismiss" "on"; @@ -773,6 +775,8 @@ group { name: "elm/hover/base/hoversel_vertical/default"; group { name: "elm/hover/base/hoversel_horizontal/default"; alias: "elm/hover/base/hoversel_horizontal/entry"; + alias: "elm/hover/base/combobox_horizontal/default"; + alias: "elm/hover/base/combobox_horizontal/entry"; images.image: "button_normal.png" COMP; data.item: "dismiss" "on"; // max_size limits the maximum size of expanded hoversel |