From b9c76a47bb951ba047803b1f132d59b7f22c152a Mon Sep 17 00:00:00 2001 From: Soohye Shin Date: Wed, 29 Jul 2015 22:03:09 +0900 Subject: [PATCH] modify transition speed - DECEL 0.3 - LINEAR 0.2 Change-Id: Icf065e28e1900db072641704d496e0185226b013 Signed-off-by: Soohye Shin --- edje/view/baritem.edc | 12 ++++++------ edje/view/home.edc | 12 ++++++------ edje/view/recent.edc | 16 ++++++++-------- edje/view/user.edc | 4 ++-- edje/view/useredit.edc | 20 ++++++++++---------- edje/widget/gengrid.edc | 4 ++-- include/defs.h | 3 +++ 7 files changed, 37 insertions(+), 34 deletions(-) diff --git a/edje/view/baritem.edc b/edje/view/baritem.edc index 805ec34..32e8f0d 100644 --- a/edje/view/baritem.edc +++ b/edje/view/baritem.edc @@ -185,7 +185,7 @@ group { signal, SIG_FOCUS; source, SRC_PROG; action, STATE_SET "focus" 0.0; - transition, LINEAR 0.5; + transition, TRANSITION_DECEL; target, "clip"; } program { @@ -193,7 +193,7 @@ group { signal, SIG_UNFOCUS; source, SRC_PROG; action, STATE_SET "default" 0.0; - transition, LINEAR 0.5; + transition, TRANSITION_DECEL; target, "clip"; } program { @@ -201,7 +201,7 @@ group { signal, SIG_FOCUS_TO_UP; source, SRC_PROG; action, STATE_SET "up" 0.0; - transition, LINEAR 0.5; + transition, TRANSITION_DECEL; target, "clip"; } program { @@ -209,7 +209,7 @@ group { signal, SIG_FOCUS_TO_DOWN; source, SRC_PROG; action, STATE_SET "down" 0.0; - transition, LINEAR 0.5; + transition, TRANSITION_DECEL; target, "clip"; } program { @@ -217,7 +217,7 @@ group { signal, SIG_FOCUS_TO_RIGHT; source, SRC_PROG; action, STATE_SET "right" 0.0; - transition, LINEAR 0.5; + transition, TRANSITION_DECEL; target, "clip"; } program { @@ -233,7 +233,7 @@ group { signal, SIG_FOCUS_TO_LEFT; source, SRC_PROG; action, STATE_SET "left" 0.0; - transition, LINEAR 0.5; + transition, TRANSITION_DECEL; target, "clip"; } program { diff --git a/edje/view/home.edc b/edje/view/home.edc index b72d4e2..837fe49 100644 --- a/edje/view/home.edc +++ b/edje/view/home.edc @@ -149,7 +149,7 @@ group { signal, SIG_SHOW; source, SRC_PROG; action, STATE_SET "show" 0.0; - transition, DECEL 0.3; + transition, TRANSITION_DECEL; target, "clip"; target, PART_HOME_MENU_BAR; } @@ -158,7 +158,7 @@ group { signal, SIG_HIDE; source, SRC_PROG; action, STATE_SET "default" 0.0; - transition, DECEL 0.3; + transition, TRANSITION_DECEL; target, "clip"; target, PART_HOME_MENU_BAR; after, "sig,hide,done"; @@ -174,7 +174,7 @@ group { action, STATE_SET "show" 0.0; target, "clip.up.arrow"; target, "clip.down.arrow"; - transition, DECEL 0.5; + transition, TRANSITION_DECEL; } program { name, "sig,hide,navigation"; @@ -183,7 +183,7 @@ group { action, STATE_SET "default" 0.0; target, "clip.up.arrow"; target, "clip.down.arrow"; - transition, DECEL 0.5; + transition, TRANSITION_DECEL; } } } @@ -316,7 +316,7 @@ group { signal, SIG_FOCUS; source, SRC_PROG; action, STATE_SET "focus" 0.0; - transition, DECEL 0.5; + transition, TRANSITION_DECEL; target, "focus"; target, "bounce.arrow"; } @@ -325,7 +325,7 @@ group { signal, SIG_UNFOCUS; source, SRC_PROG; action, STATE_SET "default" 0.0; - transition, DECEL 0.2; + transition, TRANSITION_DECEL; target, "focus"; target, "bounce.arrow"; } diff --git a/edje/view/recent.edc b/edje/view/recent.edc index 5f9fff9..a26d02b 100644 --- a/edje/view/recent.edc +++ b/edje/view/recent.edc @@ -221,7 +221,7 @@ group { signal, SIG_SHOW_RECENT; source, SRC_PROG; action, STATE_SET "show" 0.0; - transition, DECEL 0.5; + transition, TRANSITION_DECEL; target, "clip"; target, "guide"; } @@ -230,7 +230,7 @@ group { signal, SIG_HIDE_RECENT; source, SRC_PROG; action, STATE_SET "default" 0.0; - transition, DECEL 0.5; + transition, TRANSITION_DECEL; target, "clip"; target, "guide"; after, "sig.hide.recent.done"; @@ -307,7 +307,7 @@ group { signal, SIG_FOCUS; source, SRC_PROG; action, STATE_SET "focus" 0.0; - transition, LINEAR 0.5; + transition, TRANSITION_LINEAR; target, "bg"; target, "clip"; } @@ -316,7 +316,7 @@ group { signal, SIG_UNFOCUS; source, SRC_PROG; action, STATE_SET "default" 0.0; - transition, LINEAR 0.5; + transition, TRANSITION_LINEAR; target, "bg"; target, "clip"; } @@ -550,7 +550,7 @@ group { signal, SIG_FOCUS; source, SRC_PROG; action, STATE_SET "focus" 0.0; - transition, LINEAR 0.5; + transition, TRANSITION_DECEL; target, "bg"; } program { @@ -558,7 +558,7 @@ group { signal, SIG_UNFOCUS; source, SRC_PROG; action, STATE_SET "default" 0.0; - transition, LINEAR 0.5; + transition, TRANSITION_DECEL; target, "bg"; } } @@ -791,7 +791,7 @@ group { signal, SIG_FOCUS; source, SRC_PROG; action, STATE_SET "focus" 0.0; - transition, LINEAR 0.5; + transition, TRANSITION_DECEL; target, "bg"; } program { @@ -799,7 +799,7 @@ group { signal, SIG_UNFOCUS; source, SRC_PROG; action, STATE_SET "default" 0.0; - transition, LINEAR 0.5; + transition, TRANSITION_DECEL; target, "bg"; } } diff --git a/edje/view/user.edc b/edje/view/user.edc index b7a8c1e..9fc884f 100644 --- a/edje/view/user.edc +++ b/edje/view/user.edc @@ -126,7 +126,7 @@ group { signal, SIG_SHOW; source, SRC_PROG; action, STATE_SET "show" 0.0; - transition, DECEL 0.3; + transition, TRANSITION_DECEL; target, "clip"; target, PART_USER_BAR; target, "text"; @@ -136,7 +136,7 @@ group { signal, SIG_HIDE; source, SRC_PROG; action, STATE_SET "default" 0.0; - transition, DECEL 0.3; + transition, TRANSITION_DECEL; target, "clip"; target, PART_USER_BAR; target, "text"; diff --git a/edje/view/useredit.edc b/edje/view/useredit.edc index b114ac1..4aa17b7 100644 --- a/edje/view/useredit.edc +++ b/edje/view/useredit.edc @@ -781,7 +781,7 @@ group { program { name, "sig,focus,1"; action, STATE_SET "focus" 0.0; - transition, LINEAR 0.2; + transition, TRANSITION_LINEAR; target, "pad"; } program { @@ -795,7 +795,7 @@ group { program { name, "sig,unfocus,1"; action, STATE_SET "default" 0.0; - transition, LINEAR 0.2; + transition, TRANSITION_LINEAR; target, "bg.photo"; target, "clip"; } @@ -848,7 +848,7 @@ group { signal, SIG_FOCUS; source, SRC_PROG; action, STATE_SET "focus" 0.0; - transition, LINEAR 0.1; + transition, TRANSITION_LINEAR; target, "clip"; } program { @@ -856,7 +856,7 @@ group { signal, SIG_UNFOCUS; source, SRC_PROG; action, STATE_SET "default" 0.0; - transition, LINEAR 0.1; + transition, TRANSITION_LINEAR; target, "clip"; } } @@ -915,7 +915,7 @@ group { signal, SIG_FOCUS; source, SRC_PROG; action, STATE_SET "focus"; - transition, LINEAR 0.5; + transition, TRANSITION_LINEAR; target, "bg"; } program { @@ -923,7 +923,7 @@ group { signal, SIG_UNFOCUS; source, SRC_PROG; action, STATE_SET "default" 0.0; - transition, LINEAR 0.5; + transition, TRANSITION_LINEAR; target, "bg"; } program { @@ -980,7 +980,7 @@ group { signal, SIG_FOCUS; source, SRC_PROG; action, STATE_SET "focus" 0.0; - transition, LINEAR 0.5; + transition, TRANSITION_LINEAR; target, "bg"; } program { @@ -988,7 +988,7 @@ group { signal, SIG_UNFOCUS; source, SRC_PROG; action, STATE_SET "default" 0.0; - transition, LINEAR 0.5; + transition, TRANSITION_LINEAR; target, "bg"; } program { @@ -1089,7 +1089,7 @@ group { signal, SIG_FOCUS; source, SRC_PROG; action, STATE_SET "focus" 0.0; - transition, LINEAR 0.3; + transition, TRANSITION_DECEL; target, "clip"; target, "bg"; } @@ -1098,7 +1098,7 @@ group { signal, SIG_UNFOCUS; source, SRC_PROG; action, STATE_SET "default" 0.0; - transition, LINEAR 0.3; + transition, TRANSITION_DECEL; target, "clip"; target, "bg"; } diff --git a/edje/widget/gengrid.edc b/edje/widget/gengrid.edc index 31efaa4..fab6192 100644 --- a/edje/widget/gengrid.edc +++ b/edje/widget/gengrid.edc @@ -103,7 +103,7 @@ group { signal, "elm,state,focused"; source, "elm"; action, STATE_SET "focus" 0.0; - transition, LINEAR 0.1; + transition, TRANSITION_LINEAR; target, "clip"; } program { @@ -111,7 +111,7 @@ group { signal, "elm,state,unfocused"; source, "elm"; action, STATE_SET "default" 0.0; - transition, LINEAR 0.1; + transition, TRANSITION_LINEAR; target, "clip"; } } diff --git a/include/defs.h b/include/defs.h index 73d131a..ad6dec3 100644 --- a/include/defs.h +++ b/include/defs.h @@ -193,4 +193,7 @@ #define GUM_LIST_USERTYPE_NORMAL "normal" #define GUM_LIST_USERTYPE_ADMIN "admin" +#define TRANSITION_DECEL DECEL 0.3 +#define TRANSITION_LINEAR LINEAR 0.2 + #endif /* __AIR_HOME_DEFS_H__ */ -- 2.7.4