rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=e9dfef105c79ebc3cadacd5ff740900ae71c8086
commit e9dfef105c79ebc3cadacd5ff740900ae71c8086 Author: Mykyta Biliavskyi <[email protected]> Date: Mon Jul 25 12:18:32 2016 +0300 Tizen theme: fix style for horizontal spinner. --- data/themes/tizen/widgets/spinner.edc | 118 +++++++++++++++++++++++++++++----- 1 file changed, 103 insertions(+), 15 deletions(-) diff --git a/data/themes/tizen/widgets/spinner.edc b/data/themes/tizen/widgets/spinner.edc index 0b31342..cdb1ab5 100644 --- a/data/themes/tizen/widgets/spinner.edc +++ b/data/themes/tizen/widgets/spinner.edc @@ -267,24 +267,42 @@ group { name: "elm/spinner/base/vertical"; } } } + group { name: "elm/spinner/base/default"; alias: "elm/spinner/base/colorselector/default"; images { - image: "General/zoom_btn_l_nor.png" COMP; - image: "General/zoom_btn_l_sel.png" COMP; - image: "General/zoom_btn_l_dim.png" COMP; - image: "General/zoom_btn_r_nor.png" COMP; - image: "General/zoom_btn_r_sel.png" COMP; - image: "General/zoom_btn_r_dim.png" COMP; + image: "General/zoom_btn_l_nor.png" COMP; + image: "General/zoom_btn_l_sel.png" COMP; + image: "General/zoom_btn_l_dim.png" COMP; + image: "General/zoom_btn_l_mv.png" COMP; + image: "General/zoom_btn_r_nor.png" COMP; + image: "General/zoom_btn_r_sel.png" COMP; + image: "General/zoom_btn_r_dim.png" COMP; + image: "General/zoom_btn_r_mv.png" COMP; } parts { + part { name: "dummy_enable"; + type: SPACER; + description { state: "default" 0.0; + } + description { state: "disabled" 0.0; + inherit: "default" 0.00; + } + description { state: "active" 0.0; + inherit: "default" 0.00; + } + } part { name: "bg"; type: RECT; description { state: "default" 0.0; min: 76 24; - max: -1 24; + max: 76 24; color_class: "border"; } + description { state: "active" 0.0; + inherit: "default" 0.00; + color_class: "border_focused"; + } } part { name: "area.drag"; type: SPACER; @@ -326,7 +344,7 @@ group { name: "elm/spinner/base/default"; color2: 0 0 0 0; color3: 0 0 0 0; text { - font: FN; + font: "Breeze"; size: 15; } rel1.to: "elm.swallow.entry"; @@ -343,18 +361,28 @@ group { name: "elm/spinner/base/default"; description { state: "default" 0.0; align: 0.0 0.5; fixed: 1 0; + min: 17 22; max: 17 22; image.normal: "General/zoom_btn_l_nor.png"; + fill.smooth: 0; rel1.to: "area.drag"; rel2.to: "area.drag"; } description { state: "clicked" 0.0; inherit: "default" 0.00; + min: 0 0; image.normal: "General/zoom_btn_l_sel.png"; } description { state: "disabled" 0.0; + inherit: "clicked" 0.00; image.normal: "General/zoom_btn_l_dim.png"; + } + description { state: "hovered" 0.0; inherit: "default" 0.00; + image.normal: "General/zoom_btn_l_mv.png"; + } + description { state: "active" 0.0; + inherit: "clicked" 0.00; } } part { name: "button.up"; @@ -365,6 +393,7 @@ group { name: "elm/spinner/base/default"; fixed: 1 0; max: 17 22; image.normal: "General/zoom_btn_r_nor.png"; + fill.smooth: 0; rel1.to: "area.drag"; rel2.to: "area.drag"; } @@ -376,6 +405,14 @@ group { name: "elm/spinner/base/default"; inherit: "default" 0.00; image.normal: "General/zoom_btn_r_dim.png"; } + description { state: "hovered" 0.0; + inherit: "default" 0.00; + image.normal: "General/zoom_btn_r_mv.png"; + } + description { state: "active" 0.0; + inherit: "default" 0.00; + image.normal: "General/zoom_btn_r_sel.png"; + } } part { name: "elm.swallow.entry"; type: SWALLOW; @@ -422,7 +459,7 @@ group { name: "elm/spinner/base/default"; dragable { x: 1 0 0; y: 0 0 0; - threshold: "bg"; + threshold: "dummy_enable"; } description { state: "default" 0.0; color: 0 0 0 0; @@ -451,33 +488,40 @@ group { name: "elm/spinner/base/default"; visible: 1; } } + part { name: "events"; + type: RECT; + repeat_events: 1; + description { state: "default" 0.0; + color: 0 0 0 0; + } + } } programs { program { name: "down_press"; signal: "mouse,down,1"; source: "button.down"; - action: STATE_SET "clicked" 0.00; + action: STATE_SET "default" 0.00; target: "button.down"; after: "decrement_start"; } program { name: "down_unpress"; signal: "mouse,up,1"; source: "button.down"; - action: STATE_SET "default" 0.00; + action: STATE_SET "clicked" 0.00; target: "button.down"; after: "decrement_stop"; } program { name: "up_press"; signal: "mouse,down,1"; source: "button.up"; - action: STATE_SET "clicked" 0.00; + action: STATE_SET "default" 0.00; target: "button.up"; after: "increment_start"; } program { name: "up_unpress"; signal: "mouse,up,1"; source: "button.up"; - action: STATE_SET "default" 0.00; + action: STATE_SET "clicked" 0.00; target: "button.up"; after: "increment_stop"; } @@ -492,6 +536,10 @@ group { name: "elm/spinner/base/default"; action: STATE_SET "active" 0.00; target: "elm.text"; target: "elm.swallow.entry"; + target: "button.down"; + target: "button.up"; + target: "dummy_enable"; + target: "bg"; } program { name: "inactive"; signal: "elm,state,inactive"; @@ -499,6 +547,10 @@ group { name: "elm/spinner/base/default"; action: STATE_SET "default" 0.00; target: "elm.text"; target: "elm.swallow.entry"; + target: "button.down"; + target: "button.up"; + target: "dummy_enable"; + target: "bg"; } program { name: "program_0x55a14ad0e5d0"; signal: "elm,state,enabled"; @@ -507,6 +559,7 @@ group { name: "elm/spinner/base/default"; target: "button.down"; target: "button.up"; target: "disabler"; + target: "dummy_enable"; } program { name: "program_0x55a14ad0ee20"; signal: "elm,state,disabled"; @@ -515,6 +568,7 @@ group { name: "elm/spinner/base/default"; target: "button.down"; target: "button.up"; target: "disabler"; + target: "dummy_enable"; } program { name: "decrement_start"; action: SIGNAL_EMIT "elm,action,decrement,start" "elm"; @@ -528,7 +582,41 @@ group { name: "elm/spinner/base/default"; program { name: "increment_stop"; action: SIGNAL_EMIT "elm,action,increment,stop" "elm"; } + program { name: "mouse_in"; + signal: "mouse,in"; + source: "events"; + filter: "dummy_enable" "default"; + action: STATE_SET "hovered" 0.00; + target: "button.down"; + target: "button.up"; + } + program { name: "mouse_out"; + signal: "mouse,out"; + source: "events"; + filter: "dummy_enable" "default"; + action: STATE_SET "default" 0.00; + target: "button.down"; + target: "button.up"; + } + program { name: "focused"; + signal: "elm,action,focus"; + source: "elm"; + filter: "dummy_enable" "default"; + action: STATE_SET "active" 0.00; + target: "bg"; + target: "dummy_enable"; + target: "button.down"; + target: "button.up"; + } + program { name: "unfocused"; + signal: "elm,action,unfocus"; + source: "elm"; + filter: "dummy_enable" "active"; + action: STATE_SET "default" 0.00; + target: "elm.text"; + target: "bg"; + target: "button.down"; + target: "button.up"; + } } } - - --
