jaehwan pushed a commit to branch master.
commit 2a82797144a084209443720b08c2038d5a07d30a
Author: Jaehwan Kim <[email protected]>
Date: Fri Jul 26 16:14:47 2013 +0900
Index - change the images and text's color and effect.
---
edje/edc/elm/index.edc | 485 ++++++++++++++++++++++-----------------
edje/img/ilist_1.png | Bin 1632 -> 298 bytes
edje/img/ilist_1_h.png | Bin 1619 -> 314 bytes
edje/img/ilist_2.png | Bin 2112 -> 376 bytes
edje/img/ilist_2_h.png | Bin 1669 -> 365 bytes
edje/img/ilist_item_shadow.png | Bin 378 -> 284 bytes
edje/img/ilist_item_shadow_h.png | Bin 425 -> 309 bytes
7 files changed, 274 insertions(+), 211 deletions(-)
diff --git a/edje/edc/elm/index.edc b/edje/edc/elm/index.edc
index 970e36e..3b41acf 100644
--- a/edje/edc/elm/index.edc
+++ b/edje/edc/elm/index.edc
@@ -1,7 +1,4 @@
group { name: "elm/index/base/vertical/default";
- images {
- image: "button_normal.png" COMP;
- }
parts {
part { name: "clip";
type: RECT;
@@ -44,60 +41,12 @@ group { name: "elm/index/base/vertical/default";
}
}
}
- part { name: "button_image";
- mouse_events: 1;
- clip_to: "clip2";
- description { state: "default" 0.0;
- rel1 {
- to: "elm.text.body";
- offset: -5 -5;
- }
- rel2 {
- to: "elm.text";
- offset: 4 4;
- }
- image {
- normal: "button_normal.png";
- border: 7 7 7 7;
- }
- image.middle: SOLID;
- }
- }
- part { name: "elm.text.body";
- type: TEXT;
- effect: SOFT_SHADOW;
- mouse_events: 0;
- scale: 1;
- clip_to: "clip2";
- description { state: "default" 0.0;
- align: 1.0 0.5;
- fixed: 1 1;
- rel1 {
- to: "elm.text";
- relative: 0.0 0.0;
- offset: 5 0;
- }
- rel2 {
- to: "elm.text";
- relative: 0.0 1.0;
- offset: 5 -1;
- }
- color: 224 224 224 255;
- color3: 0 0 0 64;
- text {
- font: "Sans,Edje-Vera";
- size: 20;
- min: 1 1;
- align: 1.0 0.5;
- }
- }
- }
part { name: "elm.text";
type: TEXT;
- effect: SOFT_SHADOW;
mouse_events: 0;
scale: 1;
clip_to: "clip2";
+ effect: GLOW;
description { state: "default" 0.0;
align: 1.0 0.5;
fixed: 1 1;
@@ -113,13 +62,12 @@ group { name: "elm/index/base/vertical/default";
relative: 0.0 0.5;
offset: -16 -1;
}
- color: 52 153 255 255;
- color3: 0 0 0 64;
+ color: FN_COL_HIGHLIGHT;
text {
- font: "Sans,Edje-Vera";
- size: 20;
- min: 1 1;
- align: 1.0 0.5;
+ font: FN;
+ size: 20;
+ min: 1 1;
+ align: 1.0 0.5;
}
}
}
@@ -138,11 +86,11 @@ group { name: "elm/index/base/vertical/default";
visible: 0;
rel1 {
relative: 0.0 0.0;
- offset: 0 0;
+ offset: 0 0;
}
rel2 {
relative: 0.0 0.0;
- offset: 0 0;
+ offset: 0 0;
}
}
}
@@ -204,61 +152,66 @@ group { name: "elm/index/base/vertical/default";
}
group { name: "elm/index/item/vertical/default";
- data.item: "stacking" "above";
- data.item: "selectraise" "on";
+ data.item: "stacking" "below";
images {
image: "ilist_1.png" COMP;
image: "ilist_item_shadow.png" COMP;
}
parts {
part {
- name: "base_sh";
+ name: "base";
mouse_events: 0;
description {
state: "default" 0.0;
- align: 0.0 0.0;
- min: 0 10;
- fixed: 1 1;
- rel1 {
- to: "base";
- relative: 0.0 1.0;
- offset: 0 0;
- }
- rel2 {
- to: "base";
- relative: 1.0 1.0;
- offset: -1 0;
- }
image {
- normal: "ilist_item_shadow.png";
+ normal: "ilist_1.png";
+ border: 2 2 2 2;
}
fill.smooth: 0;
}
+ description { state: "active" 0.0;
+ inherit: "default" 0.0;
+ rel1.offset: -16 0;
+ }
}
- part {
- name: "base";
+ part { name: "elm.text";
+ type: TEXT;
mouse_events: 0;
+ scale: 1;
+ effect: SHADOW BOTTOM;
description {
state: "default" 0.0;
- image {
- normal: "ilist_1.png";
- border: 2 2 2 2;
+ rel1 {
+ to: "base";
+ relative: 0.0 0.0;
+ offset: 4 4;
+ }
+ rel2 {
+ to: "base";
+ relative: 0.5 1.0;
+ offset: -1 -1;
+ }
+ color: FN_COL_DEFAULT;
+ text {
+ font: FN;
+ size: 10;
+ min: 1 1;
+ align: 0.5 0.5;
}
- fill.smooth: 0;
}
description { state: "active" 0.0;
inherit: "default" 0.0;
- rel1 {
- offset: -16 0;
- }
+ visible: 0;
}
}
- part { name: "elm.text";
- type: TEXT;
- mouse_events: 0;
+ part { name: "elm.text2";
+ type: TEXT;
+ mouse_events: 0;
scale: 1;
+ effect: GLOW;
description {
state: "default" 0.0;
+ visible: 0;
rel1 {
to: "base";
relative: 0.0 0.0;
@@ -269,17 +222,18 @@ group { name: "elm/index/item/vertical/default";
relative: 0.5 1.0;
offset: -1 -1;
}
- color: 255 255 255 255;
+ color: FN_COL_HIGHLIGHT;
text {
- font: "Sans:style=Bold";
+ font: FN;
size: 10;
- min: 1 1;
+ min: 0 0;
align: 0.5 0.5;
+ text_source: "elm.text";
}
}
description { state: "active" 0.0;
inherit: "default" 0.0;
- color: 51 153 255 255;
+ visible: 1;
}
}
}
@@ -288,28 +242,63 @@ group { name: "elm/index/item/vertical/default";
signal: "elm,state,active";
source: "elm";
action: STATE_SET "active" 0.0;
- transition: DECELERATE 0.5;
target: "elm.text";
+ target: "elm.text2";
+ after: "active_base";
+ }
+ program { name: "active_base";
+ action: STATE_SET "active" 0.0;
target: "base";
+ transition: DECELERATE 0.5;
}
program { name: "inactive";
signal: "elm,state,inactive";
source: "elm";
action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.5;
target: "elm.text";
+ target: "elm.text2";
+ after: "inactive_base";
+ }
+ program { name: "inactive_base";
+ action: STATE_SET "default" 0.0;
target: "base";
+ transition: DECELERATE 0.5;
}
}
}
group { name: "elm/index/item_odd/vertical/default";
- data.item: "stacking" "below";
+ data.item: "stacking" "above";
+ data.item: "selectraise" "on";
images {
image: "ilist_2.png" COMP;
}
parts {
part {
+ name: "base_sh";
+ mouse_events: 0;
+ description {
+ state: "default" 0.0;
+ align: 0.0 0.0;
+ min: 0 10;
+ fixed: 1 1;
+ rel1 {
+ to: "base";
+ relative: 0.0 1.0;
+ offset: 0 0;
+ }
+ rel2 {
+ to: "base";
+ relative: 1.0 1.0;
+ offset: -1 0;
+ }
+ image {
+ normal: "ilist_item_shadow.png";
+ }
+ fill.smooth: 0;
+ }
+ }
+ part {
name: "base";
mouse_events: 0;
description {
@@ -322,17 +311,47 @@ group { name: "elm/index/item_odd/vertical/default";
}
description { state: "active" 0.0;
inherit: "default" 0.0;
+ rel1.offset: -16 0;
+ }
+ }
+ part { name: "elm.text";
+ type: TEXT;
+ mouse_events: 0;
+ scale: 1;
+ effect: SHADOW BOTTOM;
+ description {
+ state: "default" 0.0;
rel1 {
- offset: -16 0;
+ to: "base";
+ relative: 0.0 0.0;
+ offset: 4 4;
+ }
+ rel2 {
+ to: "base";
+ relative: 0.5 1.0;
+ offset: -1 -1;
}
+ color: FN_COL_DEFAULT;
+ text {
+ font: FN;
+ size: 10;
+ min: 1 1;
+ align: 0.5 0.5;
+ }
+ }
+ description { state: "active" 0.0;
+ inherit: "default" 0.0;
+ visible: 0;
}
}
- part { name: "elm.text";
- type: TEXT;
- mouse_events: 0;
+ part { name: "elm.text2";
+ type: TEXT;
+ mouse_events: 0;
scale: 1;
+ effect: GLOW;
description {
state: "default" 0.0;
+ visible: 0;
rel1 {
to: "base";
relative: 0.0 0.0;
@@ -341,19 +360,20 @@ group { name: "elm/index/item_odd/vertical/default";
rel2 {
to: "base";
relative: 0.5 1.0;
- offset: -1 -1;
+ offset: -1 -1;
}
- color: 255 255 255 255;
+ color: FN_COL_HIGHLIGHT;
text {
- font: "Sans:style=Bold";
+ font: FN;
size: 10;
- min: 1 1;
+ min: 0 0;
align: 0.5 0.5;
+ text_source: "elm.text";
}
}
description { state: "active" 0.0;
inherit: "default" 0.0;
- color: 51 153 255 255;
+ visible: 1;
}
}
}
@@ -362,17 +382,27 @@ group { name: "elm/index/item_odd/vertical/default";
signal: "elm,state,active";
source: "elm";
action: STATE_SET "active" 0.0;
- transition: DECELERATE 0.5;
target: "elm.text";
+ target: "elm.text2";
+ after: "active_base";
+ }
+ program { name: "active_base";
+ action: STATE_SET "active" 0.0;
target: "base";
+ transition: DECELERATE 0.5;
}
program { name: "inactive";
signal: "elm,state,inactive";
source: "elm";
action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.5;
target: "elm.text";
+ target: "elm.text2";
+ after: "inactive_base";
+ }
+ program { name: "inactive_base";
+ action: STATE_SET "default" 0.0;
target: "base";
+ transition: DECELERATE 0.5;
}
}
}
@@ -381,9 +411,9 @@ group { name: "elm/index/base/horizontal/default";
parts {
part { name: "clip";
type: RECT;
- mouse_events: 0;
+ mouse_events: 0;
description { state: "default" 0.0;
- visible: 0;
+ visible: 0;
color: 255 255 255 0;
}
description { state: "active" 0.0;
@@ -393,7 +423,7 @@ group { name: "elm/index/base/horizontal/default";
}
part { name: "clip2";
type: RECT;
- mouse_events: 0;
+ mouse_events: 0;
clip_to: "clip";
description { state: "default" 0.0;
visible: 0;
@@ -420,58 +450,12 @@ group { name: "elm/index/base/horizontal/default";
}
}
}
- part { name: "button_image";
- mouse_events: 1;
- clip_to: "clip2";
- description { state: "default" 0.0;
- rel1 {
- to: "elm.text";
- offset: -5 -5;
- }
- rel2 {
- to: "elm.text";
- offset: 4 4;
- }
- image {
- normal: "button_normal.png";
- border: 7 7 7 7;
- }
- image.middle: SOLID;
- }
- }
- part { name: "elm.text.body";
- type: TEXT;
- effect: SOFT_SHADOW;
- mouse_events: 0;
- scale: 1;
- clip_to: "clip2";
- description { state: "default" 0.0;
- align: 0.5 1;
- fixed: 1 1;
- rel1 {
- to: "elm.text";
- relative: 0.0 0.0;
- }
- rel2 {
- to: "elm.text";
- relative: 0.1 0.0;
- }
- color: 224 224 224 255;
- color3: 0 0 0 64;
- text {
- font: "Sans,Edje-Vera";
- size: 20;
- min: 1 1;
- align: 0.5 1;
- }
- }
- }
part { name: "elm.text";
type: TEXT;
- effect: SOFT_SHADOW;
mouse_events: 0;
scale: 1;
clip_to: "clip2";
+ effect: GLOW;
description { state: "default" 0.0;
align: 0.5 1;
fixed: 1 1;
@@ -487,13 +471,12 @@ group { name: "elm/index/base/horizontal/default";
relative: 0.5 0;
offset: -1 -16;
}
- color: 51 153 255 255;
- color3: 0 0 0 64;
+ color: FN_COL_HIGHLIGHT;
text {
- font: "Sans,Edje-Vera";
- size: 20;
- min: 1 1;
- align: 0.5 1;
+ font: FN;
+ size: 20;
+ min: 1 1;
+ align: 0.5 1;
}
}
}
@@ -512,11 +495,11 @@ group { name: "elm/index/base/horizontal/default";
visible: 0;
rel1 {
relative: 0.0 0.0;
- offset: 0 0;
+ offset: 0 0;
}
rel2 {
relative: 0.0 0.0;
- offset: 0 0;
+ offset: 0 0;
}
}
}
@@ -569,36 +552,13 @@ group { name: "elm/index/base/horizontal/default";
}
group { name: "elm/index/item/horizontal/default";
- data.item: "stacking" "above";
- data.item: "selectraise" "on";
+ data.item: "stacking" "below";
images {
image: "ilist_1_h.png" COMP;
image: "ilist_item_shadow_h.png" COMP;
}
parts {
part {
- name: "base_sh";
- mouse_events: 0;
- description {
- state: "default" 0.0;
- align: 0.0 0.5;
- min: 10 0;
- fixed: 1 1;
- rel1 {
- to: "base";
- relative: 1.0 0.0;
- }
- rel2 {
- to: "base";
- relative: 1.0 1.0;
- }
- image {
- normal: "ilist_item_shadow_h.png";
- }
- fill.smooth: 0;
- }
- }
- part {
name: "base";
mouse_events: 0;
description {
@@ -611,15 +571,14 @@ group { name: "elm/index/item/horizontal/default";
}
description { state: "active" 0.0;
inherit: "default" 0.0;
- rel1 {
- offset: 0 -16;
- }
+ rel1.offset: 0 -16;
}
}
part { name: "elm.text";
- type: TEXT;
- mouse_events: 0;
+ type: TEXT;
+ mouse_events: 0;
scale: 1;
+ effect: SHADOW BOTTOM;
description {
state: "default" 0.0;
rel1 {
@@ -630,9 +589,9 @@ group { name: "elm/index/item/horizontal/default";
to: "base";
relative: 0.75 1.0;
}
- color: 255 255 255 255;
+ color: FN_COL_DEFAULT;
text {
- font: "Sans:style=Bold";
+ font: FN;
size: 10;
min: 1 1;
align: 0.5 0.5;
@@ -640,37 +599,101 @@ group { name: "elm/index/item/horizontal/default";
}
description { state: "active" 0.0;
inherit: "default" 0.0;
- color: 51 153 255 255;
+ visible: 0;
}
}
+ part { name: "elm.text2";
+ type: TEXT;
+ mouse_events: 0;
+ scale: 1;
+ effect: GLOW;
+ description {
+ state: "default" 0.0;
+ visible: 0;
+ rel1 {
+ to: "base";
+ relative: 0.25 0.0;
+ }
+ rel2 {
+ to: "base";
+ relative: 0.75 1.0;
+ }
+ color: FN_COL_HIGHLIGHT;
+ text {
+ font: FN;
+ size: 10;
+ min: 0 0;
+ align: 0.5 0.5;
+ text_source: "elm.text";
+ }
+ }
+ description { state: "active" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ }
+ }
+
}
programs {
program { name: "active";
signal: "elm,state,active";
source: "elm";
action: STATE_SET "active" 0.0;
- transition: DECELERATE 0.5;
target: "elm.text";
+ target: "elm.text2";
+ after: "active_base";
+ }
+ program { name: "active_base";
+ action: STATE_SET "active" 0.0;
target: "base";
+ transition: DECELERATE 0.5;
}
program { name: "inactive";
signal: "elm,state,inactive";
source: "elm";
action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.5;
target: "elm.text";
+ target: "elm.text2";
+ after: "inactive_base";
+ }
+ program { name: "inactive_base";
+ action: STATE_SET "default" 0.0;
target: "base";
+ transition: DECELERATE 0.5;
}
}
}
group { name: "elm/index/item_odd/horizontal/default";
- data.item: "stacking" "below";
+ data.item: "stacking" "above";
+ data.item: "selectraise" "on";
images {
image: "ilist_2_h.png" COMP;
}
parts {
part {
+ name: "base_sh";
+ mouse_events: 0;
+ description {
+ state: "default" 0.0;
+ align: 0.0 0.5;
+ min: 10 0;
+ fixed: 1 1;
+ rel1 {
+ to: "base";
+ relative: 1.0 0.0;
+ }
+ rel2 {
+ to: "base";
+ relative: 1.0 1.0;
+ }
+ image {
+ normal: "ilist_item_shadow_h.png";
+ }
+ fill.smooth: 0;
+ }
+ }
+ part {
name: "base";
mouse_events: 0;
description {
@@ -683,15 +706,14 @@ group { name: "elm/index/item_odd/horizontal/default";
}
description { state: "active" 0.0;
inherit: "default" 0.0;
- rel1 {
- offset: 0 -16;
- }
+ rel1.offset: 0 -16;
}
}
part { name: "elm.text";
- type: TEXT;
- mouse_events: 0;
+ type: TEXT;
+ mouse_events: 0;
scale: 1;
+ effect: SHADOW BOTTOM;
description {
state: "default" 0.0;
rel1 {
@@ -700,11 +722,11 @@ group { name: "elm/index/item_odd/horizontal/default";
}
rel2 {
to: "base";
- relative: 0.75 1.0;
+ relative: 0.75 1.0;
}
- color: 255 255 255 255;
+ color: FN_COL_DEFAULT;
text {
- font: "Sans:style=Bold";
+ font: FN;
size: 10;
min: 1 1;
align: 0.5 0.5;
@@ -712,26 +734,67 @@ group { name: "elm/index/item_odd/horizontal/default";
}
description { state: "active" 0.0;
inherit: "default" 0.0;
- color: 51 153 255 255;
+ visible: 0;
}
}
+ part { name: "elm.text2";
+ type: TEXT;
+ mouse_events: 0;
+ scale: 1;
+ effect: GLOW;
+ description {
+ state: "default" 0.0;
+ visible: 0;
+ rel1 {
+ to: "base";
+ relative: 0.25 0.0;
+ }
+ rel2 {
+ to: "base";
+ relative: 0.75 1.0;
+ }
+ color: FN_COL_HIGHLIGHT;
+ text {
+ font: FN;
+ size: 10;
+ min: 0 0;
+ align: 0.5 0.5;
+ text_source: "elm.text";
+ }
+ }
+ description { state: "active" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ }
+ }
+
}
programs {
program { name: "active";
signal: "elm,state,active";
source: "elm";
action: STATE_SET "active" 0.0;
- transition: DECELERATE 0.5;
target: "elm.text";
+ target: "elm.text2";
+ after: "active_base";
+ }
+ program { name: "active_base";
+ action: STATE_SET "active" 0.0;
target: "base";
+ transition: DECELERATE 0.5;
}
program { name: "inactive";
signal: "elm,state,inactive";
source: "elm";
action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.5;
target: "elm.text";
+ target: "elm.text2";
+ after: "inactive_base";
+ }
+ program { name: "inactive_base";
+ action: STATE_SET "default" 0.0;
target: "base";
+ transition: DECELERATE 0.5;
}
}
}
diff --git a/edje/img/ilist_1.png b/edje/img/ilist_1.png
index 8f608ae..06c95fb 100644
Binary files a/edje/img/ilist_1.png and b/edje/img/ilist_1.png differ
diff --git a/edje/img/ilist_1_h.png b/edje/img/ilist_1_h.png
index afc81d2..6578369 100644
Binary files a/edje/img/ilist_1_h.png and b/edje/img/ilist_1_h.png differ
diff --git a/edje/img/ilist_2.png b/edje/img/ilist_2.png
index a66affc..cdf08e3 100644
Binary files a/edje/img/ilist_2.png and b/edje/img/ilist_2.png differ
diff --git a/edje/img/ilist_2_h.png b/edje/img/ilist_2_h.png
index 7e4f4c4..55a8413 100644
Binary files a/edje/img/ilist_2_h.png and b/edje/img/ilist_2_h.png differ
diff --git a/edje/img/ilist_item_shadow.png b/edje/img/ilist_item_shadow.png
index 5212bcd..4db1e7d 100644
Binary files a/edje/img/ilist_item_shadow.png and
b/edje/img/ilist_item_shadow.png differ
diff --git a/edje/img/ilist_item_shadow_h.png b/edje/img/ilist_item_shadow_h.png
index 39572a6..26b886d 100644
Binary files a/edje/img/ilist_item_shadow_h.png and
b/edje/img/ilist_item_shadow_h.png differ
--
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
