diff options
author | Minkyu Kang <mk7.kang@samsung.com> | 2015-07-27 10:10:54 +0900 |
---|---|---|
committer | Minkyu Kang <mk7.kang@samsung.com> | 2015-07-27 10:56:15 +0900 |
commit | e92311588d7b21c348d4cccb19798abb879e1e72 (patch) | |
tree | 578ec94b3818e4ee4bfd845d3bee85b933cae71f /res | |
parent | de440fa5ec040f93aa6ed003b4bc4bf244e764d4 (diff) | |
download | air_mediahub-e92311588d7b21c348d4cccb19798abb879e1e72.tar.gz air_mediahub-e92311588d7b21c348d4cccb19798abb879e1e72.tar.bz2 air_mediahub-e92311588d7b21c348d4cccb19798abb879e1e72.zip |
fix transition values
Change-Id: Id5f7328452b503b8e61026575e08bde4398c0d6a
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Diffstat (limited to 'res')
-rw-r--r-- | res/edc/view/viewer.edc | 6 | ||||
-rw-r--r-- | res/edc/widgets/button.edc | 52 | ||||
-rw-r--r-- | res/edc/widgets/gengrid.edc | 24 | ||||
-rw-r--r-- | res/edc/widgets/genlist.edc | 6 |
4 files changed, 41 insertions, 47 deletions
diff --git a/res/edc/view/viewer.edc b/res/edc/view/viewer.edc index 7bd52c4..ead1612 100644 --- a/res/edc/view/viewer.edc +++ b/res/edc/view/viewer.edc @@ -14,8 +14,6 @@ * limitations under the License. */ -#define TRANSITION_TIME 0.25 - group { name: GRP_VIEWER_VIEW; images { @@ -489,7 +487,7 @@ group { target: "toparea"; target: "bottomarea"; target: PART_VIEWER_SLIDER; - transition: LINEAR TRANSITION_TIME; + transition: TRANSITION_SHOW_BAR; } program { name: SIG_SHOW_BAR; @@ -499,7 +497,7 @@ group { target: "toparea"; target: "bottomarea"; target: PART_VIEWER_SLIDER; - transition: LINEAR TRANSITION_TIME; + transition: TRANSITION_SHOW_BAR; after: SIG_SHOWED_BAR; } program { diff --git a/res/edc/widgets/button.edc b/res/edc/widgets/button.edc index c67bfc2..b41e7ff 100644 --- a/res/edc/widgets/button.edc +++ b/res/edc/widgets/button.edc @@ -21,8 +21,6 @@ #define STATE_PLAY 0 #define STATE_PAUSE 1 -#define TRANSITION_TIME 0.17 - group { name: "elm/button/base/base_btn_menu"; data.item: "focus_highlight" "on"; @@ -219,7 +217,7 @@ group { target: "bg_left"; target: "bg_right"; target: "elm.text"; - transition: LINEAR TRANSITION_TIME; + transition: TRANSITION_FOCUS; } program { name: "unfocused"; @@ -245,7 +243,7 @@ group { target: "bg_left"; target: "bg_right"; target: "elm.text"; - transition: LINEAR TRANSITION_TIME; + transition: TRANSITION_FOCUS; } program { name: "unfocus,foc,anim"; @@ -254,7 +252,7 @@ group { target: "bg_left"; target: "bg_right"; target: "elm.text"; - transition: LINEAR TRANSITION_TIME; + transition: TRANSITION_FOCUS; } program { name: "selected"; @@ -273,7 +271,7 @@ group { target: "bg_left"; target: "bg_right"; target: "elm.text"; - transition: LINEAR TRANSITION_TIME; + transition: TRANSITION_FOCUS; } program { name: "unselected"; @@ -292,7 +290,7 @@ group { target: "bg_left"; target: "bg_right"; target: "elm.text"; - transition: LINEAR TRANSITION_TIME; + transition: TRANSITION_FOCUS; } } } @@ -365,7 +363,7 @@ group { action: STATE_SET "focused" 0.0; target: "bg_text"; target: "elm.text"; - transition: LINEAR TRANSITION_TIME; + transition: TRANSITION_FOCUS; } program { name: "unfocused"; @@ -374,7 +372,7 @@ group { action: STATE_SET "default" 0.0; target: "bg_text"; target: "elm.text"; - transition: LINEAR TRANSITION_TIME; + transition: TRANSITION_FOCUS; } } } @@ -442,7 +440,7 @@ group { action: STATE_SET "selected" 0.0; target: "bg"; target: "color"; - transition: LINEAR TRANSITION_TIME; + transition: TRANSITION_FOCUS; } program { name: "unfocused"; @@ -451,7 +449,7 @@ group { action: STATE_SET "default" 0.0; target: "bg"; target: "color"; - transition: LINEAR TRANSITION_TIME; + transition: TRANSITION_FOCUS; } } } @@ -771,28 +769,28 @@ group { action: STATE_SET "selected" 0.0; target: "bg"; target: "color"; - transition: LINEAR TRANSITION_TIME; + transition: TRANSITION_FOCUS; } program { name: "focused,pause"; action: STATE_SET "selected_pause" 0.0; target: "bg"; target: "color"; - transition: LINEAR TRANSITION_TIME; + transition: TRANSITION_FOCUS; } program { name: "unfocused,play"; action: STATE_SET "default" 0.0; target: "bg"; target: "color"; - transition: LINEAR TRANSITION_TIME; + transition: TRANSITION_FOCUS; } program { name: "unfocused,pause"; action: STATE_SET "default_pause" 0.0; target: "bg"; target: "color"; - transition: LINEAR TRANSITION_TIME; + transition: TRANSITION_FOCUS; } } } @@ -1013,28 +1011,28 @@ group { action: STATE_SET "selected" 0.0; target: "bg"; target: "color"; - transition: LINEAR TRANSITION_TIME; + transition: TRANSITION_FOCUS; } program { name: "focused,pause"; action: STATE_SET "selected_pause" 0.0; target: "bg"; target: "color"; - transition: LINEAR TRANSITION_TIME; + transition: TRANSITION_FOCUS; } program { name: "unfocused,play"; action: STATE_SET "default" 0.0; target: "bg"; target: "color"; - transition: LINEAR TRANSITION_TIME; + transition: TRANSITION_FOCUS; } program { name: "unfocused,pause"; action: STATE_SET "default_pause" 0.0; target: "bg"; target: "color"; - transition: LINEAR TRANSITION_TIME; + transition: TRANSITION_FOCUS; } } } @@ -1569,7 +1567,7 @@ group { target: "part_focus2"; target: "part_focus3"; target: "bg_text"; - transition: LINEAR 0.17; + transition: TRANSITION_FOCUS; after: "focus,in,anim,2"; } program { @@ -1594,7 +1592,7 @@ group { target: "part_focus2"; target: "part_focus3"; target: "bg_text"; - transition: LINEAR 0.17; + transition: TRANSITION_FOCUS; after: "focus,out,anim,2"; } program { @@ -1622,14 +1620,14 @@ group { source: SIG_SOURCE_SRC; action: STATE_SET "selected" 0.0; target: "map"; - transition: DECELERATE 0.2; + transition: TRANSITION_CLICK; after: "after_selected"; } program { name: "after_selected"; action: STATE_SET "default" 0.0; target: "map"; - transition: DECELERATE 0.2; + transition: TRANSITION_CLICK; after: "item_selected"; } program { @@ -2167,7 +2165,7 @@ group { target: PART_PLAYING_CONTENT_TITLE; target: PART_PLAYING_CONTENT_ARTIST; target: PART_PLAYING_CONTENT_ALBUM; - transition: LINEAR 0.17; + transition: TRANSITION_FOCUS; after: "focus,in,anim,2"; } program { @@ -2193,7 +2191,7 @@ group { target: "part_focus2"; target: "part_focus3"; target: "bg_text"; - transition: LINEAR 0.17; + transition: TRANSITION_FOCUS; after: "focus,out,anim,2"; } program { @@ -2217,14 +2215,14 @@ group { source: SIG_SOURCE_SRC; action: STATE_SET "selected" 0.0; target: "map"; - transition: DECELERATE 0.2; + transition: TRANSITION_CLICK; after: "after_selected"; } program { name: "after_selected"; action: STATE_SET "default" 0.0; target: "map"; - transition: DECELERATE 0.2; + transition: TRANSITION_CLICK; after: "item_selected"; } program { diff --git a/res/edc/widgets/gengrid.edc b/res/edc/widgets/gengrid.edc index b298f33..9ba63a0 100644 --- a/res/edc/widgets/gengrid.edc +++ b/res/edc/widgets/gengrid.edc @@ -400,7 +400,7 @@ group { target: "part_focus2"; target: "part_focus3"; target: "elm.bg.text"; - transition: LINEAR 0.17; + transition: TRANSITION_FOCUS; after: "focus,in,anim,2"; } program { @@ -424,7 +424,7 @@ group { target: "part_focus2"; target: "part_focus3"; target: "elm.bg.text"; - transition: LINEAR 0.17; + transition: TRANSITION_FOCUS; after: "focus,out,anim,2"; } program { @@ -444,14 +444,14 @@ group { source: "elm"; action: STATE_SET "selected" 0.0; target: "map"; - transition: DECELERATE 0.2; + transition: TRANSITION_CLICK; after: "after_selected"; } program { name: "after_selected"; action: STATE_SET "default" 0.0; target: "map"; - transition: DECELERATE 0.2; + transition: TRANSITION_CLICK; after: "item_selected"; } program { @@ -832,7 +832,7 @@ group { target: "part_focus3"; target: "part_focus4"; target: PART_ELM_TEXT_PLAYTIME; - transition: LINEAR 0.17; + transition: TRANSITION_FOCUS; } program { name: "go_passive"; @@ -843,7 +843,7 @@ group { target: "part_focus2"; target: "part_focus3"; target: "part_focus4"; - transition: LINEAR 0.17; + transition: TRANSITION_FOCUS; after: "focus,out,anim"; } program { @@ -865,14 +865,14 @@ group { source: "elm"; action: STATE_SET "selected" 0.0; target: "map"; - transition: DECELERATE 0.2; + transition: TRANSITION_CLICK; after: "after_selected"; } program { name: "after_selected"; action: STATE_SET "default" 0.0; target: "map"; - transition: DECELERATE 0.2; + transition: TRANSITION_CLICK; after: "item_selected"; } program { @@ -1472,7 +1472,7 @@ group { target: "part_focus2"; target: "part_focus3"; target: "elm.bg.text"; - transition: LINEAR 0.17; + transition: TRANSITION_FOCUS; after: "focus,in,anim,2"; } program { @@ -1498,7 +1498,7 @@ group { target: "part_focus2"; target: "part_focus3"; target: "elm.bg.text"; - transition: LINEAR 0.17; + transition: TRANSITION_FOCUS; after: "focus,out,anim,2"; } program { @@ -1518,14 +1518,14 @@ group { source: "elm"; action: STATE_SET "selected" 0.0; target: "map"; - transition: DECELERATE 0.2; + transition: TRANSITION_CLICK; after: "after_selected"; } program { name: "after_selected"; action: STATE_SET "default" 0.0; target: "map"; - transition: DECELERATE 0.2; + transition: TRANSITION_CLICK; after: "item_selected"; } program { diff --git a/res/edc/widgets/genlist.edc b/res/edc/widgets/genlist.edc index 3e035dc..7309809 100644 --- a/res/edc/widgets/genlist.edc +++ b/res/edc/widgets/genlist.edc @@ -14,8 +14,6 @@ * limitations under the License. */ -#define LIST_TRANSITION_TIME 0.35 - group { name: "elm/genlist/item/music_list/default"; data.item: "selectraise" "on"; @@ -340,7 +338,7 @@ group { target: "image_padding"; target: "image_bg"; target: "time_padding"; - transition: LINEAR LIST_TRANSITION_TIME; + transition: TRANSITION_SHOW_ICON; after: "select,image"; } program { @@ -368,7 +366,7 @@ group { target: "image_padding"; target: "image_bg"; target: "time_padding"; - transition: LINEAR LIST_TRANSITION_TIME; + transition: TRANSITION_SHOW_ICON; } } } |