aboutsummaryrefslogtreecommitdiffstats
path: root/data/themes/edc/elm/focus.edc
diff options
context:
space:
mode:
authorAmitesh Singh <amitesh.sh@samsung.com>2015-06-25 16:15:06 +0200
committerCedric BAIL <cedric@osg.samsung.com>2015-06-25 17:24:08 +0200
commit8889b728774bd479294ee5029730c90cdddf4450 (patch)
tree52b78f9d53c8e26ae62915d9d74b5137390e1798 /data/themes/edc/elm/focus.edc
parentcalendar: show days of prev/next month. (diff)
downloadelementary-8889b728774bd479294ee5029730c90cdddf4450.tar.gz
genlist/list/win: Revert focus highlight animation when looping is enable
Summary: - Revert "focus: Added internal widget APIs of focus highlight object of elm window." This reverts commit 3f98d71830163a154762f2d16301d720c781b7c5. - Revert "List: Focus highlight when loop is enable" This reverts commit 57ad32a900e71f83441bf7246671b8f16a8ec909. - Revert "genlist: Focus highlight when loop is enable" This reverts commit 91282a22cba66ee5e7799018d3abe8957fb1b1fa. Reviewers: seoz, raster, jpeg, SanghyeonLee Subscribers: anand.km, seoz Differential Revision: https://phab.enlightenment.org/D2725 Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
Diffstat (limited to 'data/themes/edc/elm/focus.edc')
-rw-r--r--data/themes/edc/elm/focus.edc173
1 files changed, 13 insertions, 160 deletions
diff --git a/data/themes/edc/elm/focus.edc b/data/themes/edc/elm/focus.edc
index 5c06179b9..19d78cde7 100644
--- a/data/themes/edc/elm/focus.edc
+++ b/data/themes/edc/elm/focus.edc
@@ -5,7 +5,7 @@ group { name: "elm/focus_highlight/top/default";
script {
public s_x, s_y, s_w, s_h; /* source */
public difx, dify, difw, difh;
-
+
public animator1(val, Float:pos) {
new x, y, w, h, dx, dy, dw, dh, Float:p;
p = 1.0 - ((1.0 - pos) * (1.0 - pos) * (1.0 - pos));
@@ -19,16 +19,16 @@ group { name: "elm/focus_highlight/top/default";
h = get_int(s_h) + dh;
update_offset(x, y, w, h);
}
-
+
public update_offset(x, y, w, h) {
set_state_val(PART:"base", STATE_REL1_OFFSET, x, y);
set_state_val(PART:"base", STATE_REL2_OFFSET, x + w, y + h);
}
-
+
public message(Msg_Type:type, id, ...) {
if ((type == MSG_INT_SET) && (id == 1)) {
new x1, y1, w1, h1, x2, y2, w2, h2;
-
+
x1 = getarg(2);
y1 = getarg(3);
w1 = getarg(4);
@@ -37,7 +37,7 @@ group { name: "elm/focus_highlight/top/default";
y2 = getarg(7);
w2 = getarg(8);
h2 = getarg(9);
-
+
set_int(s_x, x1);
set_int(s_y, y1);
set_int(s_w, w1);
@@ -46,74 +46,31 @@ group { name: "elm/focus_highlight/top/default";
set_int(dify, y2 - y1);
set_int(difw, w2 - w1);
set_int(difh, h2 - h1);
-
+
custom_state(PART:"base", "default", 0.0);
set_state_val(PART:"base", STATE_REL1, 0.0, 0.0);
set_state_val(PART:"base", STATE_REL2, 0.0, 0.0);
update_offset(x1, y1, w1, h1);
set_state(PART:"base", "custom", 0.0);
-
+
anim(0.2, "animator1", 1);
}
}
}
parts {
- part { name: "base"; type: RECT;
- clip_to: "clip";
+ part { name: "base"; type: SPACER;
description { state: "default" 0.0;
- visible: 0;
- }
- description { state: "move_down" 0.0;
- inherit: "default" 0.0;
- rel1.relative: 0 1;
- rel2.relative: 1 2;
- }
- description { state: "move_up" 0.0;
- inherit: "default" 0.0;
- rel1.relative: 0 -1;
- rel2.relative: 1 0;
- }
- description { state: "move_left" 0.0;
- inherit: "default" 0.0;
- rel1.relative: -1 0;
- rel2.relative: 0 1;
- }
- description { state: "move_right" 0.0;
- inherit: "default" 0.0;
- rel1.relative: 1 0;
- rel2.relative: 2 1;
}
}
part { name: "clip"; type: RECT;
- scale: 1;
- description {
- state: "default" 0.0;
- color: 255 255 255 255;
- rel1.relative: -1 -1;
- rel2.relative: 2 2;
- }
- description { state: "move_down" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 0;
- }
- description { state: "move_up" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 0 ;
- }
- description { state: "move_left" 0.0;
- inherit: "default" 0.0;
+ description { state: "default" 0.0;
+ rel1.to: "glow";
+ rel2.to: "glow";
color: 255 255 255 0;
}
- description { state: "move_right" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 0 ;
- }
description { state: "visible" 0.0;
inherit: "default" 0.0;
- }
- description { state: "invisible" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 0;
+ color: 255 255 255 255;
}
}
part { name: "glow"; mouse_events: 0;
@@ -164,7 +121,7 @@ group { name: "elm/focus_highlight/top/default";
}
program {
signal: "elm,action,focus,hide"; source: "elm";
- action: STATE_SET "invisible" 0.0;
+ action: STATE_SET "default" 0.0;
transition: DECELERATE 0.4;
target: "clip";
after: "stop2";
@@ -196,109 +153,5 @@ group { name: "elm/focus_highlight/top/default";
action: STATE_SET "default" 0.0;
target: "base";
}
- program { name: "move_down";
- signal: "elm,action,focus,move,down";
- source: "elm";
- transition: LIN 0.3;
- action: STATE_SET "move_down" 0.0;
- target: "base";
- target: "clip";
- after: "move_down_end";
- }
- program { name: "move_down_end";
- action: SIGNAL_EMIT "elm,focus,move,down,end" "elm";
- }
- program { name: "move_up";
- signal: "elm,action,focus,move,up";
- source: "elm";
- transition: LIN 0.3;
- action: STATE_SET "move_up" 0.0;
- target: "base";
- target: "clip";
- after: "move_up_end";
- }
- program { name: "move_up_end";
- action: SIGNAL_EMIT "elm,focus,move,up,end" "elm";
- }
- program { name: "move_home_from_up";
- signal: "elm,action,focus,move,home,up";
- source: "elm";
- action: STATE_SET "move_up" 0.0;
- target: "base";
- target: "clip";
- after: "move_home_from_up2";
- }
- program { name: "move_home_from_up2";
- action: STATE_SET "default" 0.0;
- transition: LIN 0.3;
- target: "base";
- target: "clip";
- }
- program { name: "move_home_from_down";
- signal: "elm,action,focus,move,home,down";
- source: "elm";
- action: STATE_SET "move_down" 0.0;
- target: "base";
- target: "clip";
- after: "move_home_from_down2";
- }
- program { name: "move_home_from_down2";
- action: STATE_SET "default" 0.0;
- transition: LIN 0.3;
- target: "base";
- target: "clip";
- }
- program { name: "move_left";
- signal: "elm,action,focus,move,left";
- source: "elm";
- transition: LIN 0.3;
- action: STATE_SET "move_left" 0.0;
- target: "base";
- target: "clip";
- after: "move_left_end";
- }
- program { name: "move_left_end";
- action: SIGNAL_EMIT "elm,focus,move,left,end" "elm";
- }
- program { name: "move_right";
- signal: "elm,action,focus,move,right";
- source: "elm";
- transition: LIN 0.3;
- action: STATE_SET "move_right" 0.0;
- target: "base";
- target: "clip";
- after: "move_right_end";
- }
- program { name: "move_right_end";
- action: SIGNAL_EMIT "elm,focus,move,right,end" "elm";
- }
- program { name: "move_home_from_right";
- signal: "elm,action,focus,move,home,right";
- source: "elm";
- action: STATE_SET "move_right" 0.0;
- target: "base";
- target: "clip";
- after: "move_home_from_right2";
- }
- program { name: "move_home_from_right2";
- action: STATE_SET "default" 0.0;
- transition: LIN 0.3;
- target: "base";
- target: "clip";
- }
- program { name: "move_home_from_left";
- signal: "elm,action,focus,move,home,left";
- source: "elm";
- action: STATE_SET "move_left" 0.0;
- target: "base";
- target: "clip";
- after: "move_home_from_left2";
- }
- program { name: "move_home_from_left2";
- action: STATE_SET "default" 0.0;
- transition: LIN 0.3;
- target: "base";
- target: "clip";
- }
}
}