rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=9571812c63953ec0b7247b0c9ae59f1a538baf22
commit 9571812c63953ec0b7247b0c9ae59f1a538baf22
Author: Vyacheslav Reutskiy <v.reuts...@samsung.com>
Date: Mon Feb 8 14:50:22 2016 +0200
gengrid.edc: update the default/default item accordigly to guideline
Change-Id: I5e5fb2031172430eda7eabda990a67d890129a46
---
data/themes/default/widgets/gengrid.edc | 393 +++++++++++++++-----------------
1 file changed, 183 insertions(+), 210 deletions(-)
diff --git a/data/themes/default/widgets/gengrid.edc
b/data/themes/default/widgets/gengrid.edc
index e02cd7c..1090f85 100644
--- a/data/themes/default/widgets/gengrid.edc
+++ b/data/themes/default/widgets/gengrid.edc
@@ -1,240 +1,213 @@
#define BORDER_PADDING 5 5
-group { name: "elm/gengrid/item/default/default";
- data.item: "texts" "elm.text";
- data.item: "contents" "elm.swallow.icon elm.swallow.end";
- images {
- image: "image_border.png" COMP;
- }
- parts {
- part { name: "spacer1";
- type: SPACER;
- description { state: "default" 0.0;
- align: 0.0 0.0;
- min: 2 2;
- max: 2 2;
- }
- }
- part { name: "spacer2";
- type: SPACER;
- description { state: "default" 0.0;
- align: 1.0 1.0;
- min: 2 2;
- max: 2 2;
- }
- }
- part { name: "highlight";
- type: RECT;
- clip_to: "disclip";
- mouse_events: 0;
- description { state: "default" 0.0;
- visible: 0;
- color: 255 255 255 0;
- rel1 {
- relative: 1.0 1.0;
- to: "spacer1";
+ group { name: "elm/gengrid/item/default/default";
+ images {
+ image: "image_border.png" COMP;
+ }
+ data {
+ item: "texts" "elm.text";
+ item: "contents" "elm.swallow.icon elm.swallow.end";
+ }
+ parts {
+ part { name: "highlight_content";
+ type: RECT;
+ mouse_events: 0;
+ clip_to: "disclip";
+ description { state: "default" 0.0;
+ visible: 0;
+ color_class: "select";
+ rel1 {
+ to: "elm.swallow.icon";
+ }
+ rel2 {
+ to: "elm.swallow.icon";
+ }
}
- rel2 {
- relative: 0.0 0.0;
- to: "spacer2";
+ description { state: "selected" 0.0;
+ color_class: "select";
+ rel1 {
+ to: "elm.swallow.icon";
+ }
+ rel2 {
+ to: "elm.swallow.icon";
+ }
}
}
- description { state: "selected" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- color: HIGHLIGHT_TOOLBAR_BLUE;
- }
- }
- part { name: "elm.swallow.pad";
- type: SWALLOW;
- description { state: "default" 0.0;
- fixed: 1 0;
- align: 0.0 1.0;
- min: 0 2;
- rel1 {
- relative: 1.0 0.0;
- to_x: "spacer1";
- to_y: "spacer2";
+ part { name: "highlight_text";
+ type: RECT;
+ description { state: "default" 0.0;
+ visible: 0;
+ color_class: "select";
+ rel1 {
+ to: "elm.text";
+ }
+ rel2 {
+ to: "elm.text";
+ }
}
- rel2 {
- relative: 1.0 0.0;
- to_x: "spacer1";
- to_y: "elm.text";
+ description { state: "selected" 0.0;
+ color_class: "select";
+ rel1 {
+ to: "elm.text";
+ }
+ rel2 {
+ to: "elm.text";
+ }
}
}
- }
- part { name: "icon_border";
- type:IMAGE;
- description { state: "default" 0.0;
- image {
- normal: "image_border.png";
- border: 1 1 1 1;
- middle: 0;
- }
- rel1 {
- relative: 1.0 1.0;
- to: "spacer1";
- }
- rel2 {
- relative: 1.0 0.0;
- to_y: "elm.text";
+ part { name: "elm.swallow.pad";
+ type: SWALLOW;
+ description { state: "default" 0.0;
+ align: 0.0 1.0;
+ fixed: 1 0;
+ min: 0 2;
+ rel1 {
+ relative: 1.0 0.0;
+ }
+ rel2 {
+ relative: 1.0 0.0;
+ to_y: "elm.text";
+ }
}
}
- }
- part { name: "spacer_border_top";
- type: SPACER;
- description { state: "default" 0.0;
- align: 0.0 0.0;
- SET_SIZE(BORDER_PADDING, BORDER_PADDING);
- rel1.to: "icon_border";
- rel2.to: "icon_border";
- }
- }
- part { name: "spacer_border_bottom";
- type: SPACER;
- description { state: "default" 0.0;
- align: 1.0 1.0;
- SET_SIZE(BORDER_PADDING, BORDER_PADDING);
- rel1.to: "icon_border";
- rel2.to: "icon_border";
+ part { name: "icon_border";
+ type: IMAGE;
+ description { state: "default" 0.0;
+ rel1 {
+ offset: 3 3;
+ }
+ rel2 {
+ relative: 1.0 0.0;
+ offset: -4 -4;
+ to_y: "elm.text";
+ }
+ image {
+ normal: "image_border.png";
+ border: 1 1 1 1;
+ middle: NONE;
+ }
+ }
}
- }
- part { name: "elm.swallow.icon";
- clip_to: "disclip";
- repeat_events: 1;
- type: SWALLOW;
- description { state: "default" 0.0;
- fixed: 1 0;
- align: 0.5 0.5;
- rel1 {
- to: "spacer_border_top";
- relative: 1.0 1.0;
+ part { name: "elm.swallow.icon";
+ type: SWALLOW;
+ repeat_events: 1;
+ clip_to: "disclip";
+ description { state: "default" 0.0;
+ fixed: 1 0;
+ rel1 {
+ offset: 1 1;
+ to: "icon_border";
+ }
+ rel2 {
+ offset: -2 -2;
+ to: "icon_border";
+ }
}
- rel2 {
- to: "spacer_border_bottom";
- relative: 0.0 0.0;
+ }
+ part { name: "elm.swallow.end";
+ type: SWALLOW;
+ clip_to: "disclip";
+ description { state: "default" 0.0;
+ align: 1.0 0.0;
+ fixed: 1 1;
+ max: 16 16;
+ aspect_preference: HORIZONTAL;
+ rel1 {
+ offset: 0 1;
+ to: "icon_border";
+ }
+ rel2 {
+ offset: -2 -1;
+ to: "icon_border";
+ }
}
}
- }
- part { name: "elm.swallow.end";
- clip_to: "disclip";
- type: SWALLOW;
- description { state: "default" 0.0;
- fixed: 1 0;
- align: 1.0 0.0;
- aspect: 1.0 1.0;
- aspect_preference: HORIZONTAL;
- max: 24 24;
- rel1 {
- to: "spacer_border_top";
- relative: 1.0 1.0;
+ part { name: "elm.text";
+ type: TEXT;
+ scale: 1;
+ description { state: "default" 0.0;
+ align: 0.5 1.0;
+ color_class: "main";
+ rel1 {
+ offset: 1 0;
+ to_x: "icon_border";
+ }
+ rel2 {
+ offset: -2 -4;
+ to_x: "icon_border";
+ }
+ text {
+ font: "PT";
+ size: 11;
+ max: 0 1;
+ }
}
- rel2 {
- to: "spacer_border_bottom";
- relative: 0.0 0.0;
+ }
+ part { name: "text_bottom";
+ type: SPACER;
+ description { state: "default" 0.0;
+ align: 1.0 1.0;
+ min: 2 2;
+ max: 2 2;
}
}
- }
- part { name: "elm.text";
- clip_to: "disclip";
- type: TEXT;
- mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- align: 1.0 1.0;
- rel1 {
- relative: 0.0 0.0;
- to_x: "icon_border";
- to_y: "text_bottom";
- offset: 2 0;
+ part { name: "event";
+ type: RECT;
+ description { state: "default" 0.0;
+ color: 0 0 0 0;
}
- rel2 {
- relative: 1.0 0.0;
- to_x: "icon_border";
- to_y: "text_bottom";
- offset: -2 0;
+ }
+ part { name: "disclip";
+ type: RECT;
+ mouse_events: 0;
+ repeat_events: 1;
+ description { state: "default" 0.0;
+ rel1 {
+ to: "highlight_content";
+ }
+ rel2 {
+ to: "highlight_content";
+ }
}
- color: FN_COL_LIGHT_GREY;
- text {
- font: FN;
- size: 11;
- min: 0 1;
- align: 0.5 1.0;
+ description { state: "disabled" 0.0;
+ color: 255 255 255 0;
+ rel1 {
+ to: "highlight_content";
+ }
+ rel2 {
+ to: "highlight_content";
+ }
}
}
- description { state: "selected" 0.0;
- inherit: "default" 0.0;
- color: FN_COL_DEFAULT;
- }
}
- part { name: "text_bottom";
- type: SPACER;
- description { state: "default" 0.0;
- min: 2 2;
- max: 2 2;
- align: 1.0 1.0;
- rel2 {
- relative: 0.0 0.0;
- to: "spacer2";
- }
+ programs {
+ program { name: "go_active";
+ signal: "elm,state,selected";
+ source: "elm";
+ action: STATE_SET "selected" 0.00;
+ target: "highlight_content";
+ target: "highlight_text";
}
- }
- part { name: "event";
- type: RECT;
- repeat_events: 0;
- description {
- state: "default" 0.0;
- color: 0 0 0 0;
+ program { name: "go_passive";
+ signal: "elm,state,unselected";
+ source: "elm";
+ action: STATE_SET "default" 0.00;
+ target: "highlight_content";
+ target: "highlight_text";
}
- }
- part { name: "disclip";
- type: RECT;
- repeat_events: 1;
- mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "highlight";
- rel2.to: "highlight";
+ program { name: "go_disabled";
+ signal: "elm,state,disabled";
+ source: "elm";
+ action: STATE_SET "disabled" 0.00;
+ target: "disclip";
}
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 0;
+ program { name: "go_enabled";
+ signal: "elm,state,enabled";
+ source: "elm";
+ action: STATE_SET "default" 0.00;
+ target: "disclip";
}
}
}
- programs {
- program {
- name: "go_active";
- signal: "elm,state,selected";
- source: "elm";
- action: STATE_SET "selected" 0.0;
- target: "highlight";
- target: "elm.text";
- transition: ACCELERATE 0.1;
- }
- program {
- name: "go_passive";
- signal: "elm,state,unselected";
- source: "elm";
- action: STATE_SET "default" 0.0;
- target: "elm.text";
- target: "highlight";
- transition: ACCELERATE 0.2;
- }
- program {
- name: "go_disabled";
- signal: "elm,state,disabled";
- source: "elm";
- action: STATE_SET "disabled" 0.0;
- target: "disclip";
- }
- program {
- name: "go_enabled";
- signal: "elm,state,enabled";
- source: "elm";
- action: STATE_SET "default" 0.0;
- target: "disclip";
- }
- }
-}
#define SOUND_EDITOR_BG_COLOR 17 70 98 255
#define SOUND_EDITOR_HIGHLIGHT_COLOR 6 130 134 255
--
