rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=93f43f5d91b6c980dafced22edbcb43d56384aca
commit 93f43f5d91b6c980dafced22edbcb43d56384aca Author: Mykyta Biliavskyi <[email protected]> Date: Mon Jul 25 12:38:47 2016 +0300 Tizen theme: fix vertical style for spinner widget. Updated accordingly to general guidline. --- data/themes/tizen/widgets/spinner.edc | 99 +++++++++++++++++++++++++++++++++-- 1 file changed, 94 insertions(+), 5 deletions(-) diff --git a/data/themes/tizen/widgets/spinner.edc b/data/themes/tizen/widgets/spinner.edc index cdb1ab5..2e26a38 100644 --- a/data/themes/tizen/widgets/spinner.edc +++ b/data/themes/tizen/widgets/spinner.edc @@ -3,11 +3,25 @@ group { name: "elm/spinner/base/vertical"; image: "Tizen general/down_nor.png" COMP; image: "Tizen general/down_sel.png" COMP; image: "Tizen general/down_dim.png" COMP; + image: "Tizen general/down_mv.png" COMP; image: "Tizen general/up_nor.png" COMP; image: "Tizen general/up_sel.png" COMP; image: "Tizen general/up_dim.png" COMP; + image: "Tizen general/up_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; @@ -15,6 +29,10 @@ group { name: "elm/spinner/base/vertical"; max: 50 24; color_class: "border"; } + description { state: "active" 0.0; + inherit: "default" 0.00; + color_class: "border_focused"; + } } part { name: "area.drag"; type: SPACER; @@ -40,7 +58,7 @@ group { name: "elm/spinner/base/vertical"; } rel2 { relative: 0.0 1.0; - offset: -2 -2; + offset: -1 -2; to_x: "button.up"; to_y: "bg"; } @@ -73,7 +91,9 @@ group { name: "elm/spinner/base/vertical"; align: 0.0 1.0; fixed: 1 0; max: 13 11; + min: 13 11; image.normal: "Tizen general/down_nor.png"; + fill.smooth: 0; rel1.to: "button.up"; rel2.to: "area.drag"; } @@ -87,6 +107,13 @@ group { name: "elm/spinner/base/vertical"; inherit: "clicked" 0.00; image.normal: "Tizen general/down_dim.png"; } + description { state: "hovered" 0.0; + inherit: "clicked" 0.00; + image.normal: "Tizen general/down_mv.png"; + } + description { state: "active" 0.0; + inherit: "clicked" 0.00; + } } part { name: "button.up"; type: IMAGE; @@ -94,7 +121,9 @@ group { name: "elm/spinner/base/vertical"; description { state: "default" 0.0; align: 1.0 0.0; fixed: 1 0; + min: 13 11; max: 13 11; + fill.smooth: 0; image.normal: "Tizen general/up_nor.png"; rel1.to: "area.drag"; rel2.to: "area.drag"; @@ -107,6 +136,13 @@ group { name: "elm/spinner/base/vertical"; inherit: "default" 0.00; image.normal: "Tizen general/up_dim.png"; } + description { state: "hovered" 0.0; + inherit: "default" 0.00; + image.normal: "Tizen general/up_mv.png"; + } + description { state: "active" 0.0; + inherit: "clicked" 0.00; + } } part { name: "elm.swallow.entry"; type: SWALLOW; @@ -188,33 +224,40 @@ group { name: "elm/spinner/base/vertical"; } } } + 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"; } @@ -229,6 +272,10 @@ group { name: "elm/spinner/base/vertical"; 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"; @@ -236,6 +283,10 @@ group { name: "elm/spinner/base/vertical"; 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"; @@ -244,6 +295,7 @@ group { name: "elm/spinner/base/vertical"; target: "button.down"; target: "button.up"; target: "disabler"; + target: "dummy_enable"; } program { name: "program_0x55a14ad0ee20"; signal: "elm,state,disabled"; @@ -252,6 +304,7 @@ group { name: "elm/spinner/base/vertical"; target: "button.down"; target: "button.up"; target: "disabler"; + target: "dummy_enable"; } program { name: "decrement_start"; action: SIGNAL_EMIT "elm,action,decrement,start" "elm"; @@ -265,6 +318,42 @@ group { name: "elm/spinner/base/vertical"; 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"; + } } } --
