rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=6c5658458abe4b8d55aa2016c2acb20904ab65ac
commit 6c5658458abe4b8d55aa2016c2acb20904ab65ac
Author: Andrii Kroitor <an.kroi...@samsung.com>
Date: Tue Feb 9 18:43:13 2016 +0200
group_navigator: update parts/programs caption
---
data/themes/default/widgets/genlist.edc | 245 ++++++--------------------------
src/bin/ui/group_navigator.c | 2 +-
2 files changed, 47 insertions(+), 200 deletions(-)
diff --git a/data/themes/default/widgets/genlist.edc
b/data/themes/default/widgets/genlist.edc
index a602143..2145706 100644
--- a/data/themes/default/widgets/genlist.edc
+++ b/data/themes/default/widgets/genlist.edc
@@ -1139,13 +1139,11 @@ group { name: "elm/genlist/tree/items_caption/default";
}
}
-group { name: "elm/genlist/tree/item/default";
+group { name: "elm/genlist/tree/caption/default";
data {
item: "texts" "elm.text elm.text.end";
item: "treesize" "20";
- item: "contents" "elm.swallow.icon elm.swallow.end elm.swallow.penult";
- item: "stacking" "above";
- item: "selectraise" "on";
+ item: "contents" "elm.swallow.icon";
}
parts {
part { name: "bg";
@@ -1157,13 +1155,7 @@ group { name: "elm/genlist/tree/item/default";
}
}
description { state: "selected" 0.0;
- color_class: "select_dark";
- rel2 {
- offset: -1 -2;
- }
- }
- description { state: "reorder" 0.0;
- color_class: "select_dark";
+ color_class: "select";
rel2 {
offset: -1 -2;
}
@@ -1177,13 +1169,6 @@ group { name: "elm/genlist/tree/item/default";
max: -1 1;
color: 68 68 68 255;
}
- description { state: "hide" 0.0;
- visible: 0;
- align: 0.5 1.0;
- min: 0 1;
- max: -1 1;
- color: 68 68 68 255;
- }
}
part { name: "elm.swallow.icon";
type: SWALLOW;
@@ -1201,46 +1186,6 @@ group { name: "elm/genlist/tree/item/default";
offset: -1 -4;
}
}
- description { state: "hide" 0.0;
- visible: 0;
- align: 0.0 0.5;
- min: 14 14;
- aspect: 1.0 1.0;
- aspect_preference: VERTICAL;
- rel1 {
- offset: 6 3;
- }
- rel2 {
- relative: 0.0 1.0;
- offset: -1 -4;
- }
- }
- }
- part { name: "elm.swallow.pad";
- type: SWALLOW;
- description { state: "default" 0.0;
- align: 0.0 0.5;
- rel1 {
- relative: 1.0 0.0;
- offset: 6 0;
- to_x: "elm.swallow.icon";
- }
- rel2 {
- to_x: "elm.swallow.icon";
- }
- }
- description { state: "hide" 0.0;
- visible: 0;
- align: 0.0 0.5;
- rel1 {
- relative: 1.0 0.0;
- offset: 6 0;
- to_x: "elm.swallow.icon";
- }
- rel2 {
- to_x: "elm.swallow.icon";
- }
- }
}
part { name: "elm.text";
type: TEXT;
@@ -1255,93 +1200,56 @@ group { name: "elm/genlist/tree/item/default";
to_x: "arrow";
}
rel2 {
- relative: 0.0 1.0;
offset: -7 -1;
- to_x: "elm.swallow.penult";
}
text {
- font: "PT";
+ font: "PT:style=Bold";
size: 12;
max: 1 0;
align: 0.0 0.5;
}
}
- description { state: "hide" 0.0;
- visible: 0;
+ }
+ part { name: "elm.text.end";
+ type: TEXT;
+ repeat_events: 1;
+ description { state: "default" 0.0;
+ align: 0.0 0.5;
min: 0 26;
- color_class: "main";
+ color_class: "select";
rel1 {
relative: 1.0 0.0;
offset: 6 0;
- to_x: "arrow";
+ to_x: "elm.text";
}
rel2 {
- relative: 0.0 1.0;
offset: -7 -1;
- to_x: "elm.swallow.penult";
}
text {
- font: "PT";
+ font: "PT:style=Bold";
size: 12;
align: 0.0 0.5;
}
}
- }
- part { name: "elm.swallow.penult";
- type: SWALLOW;
- description { state: "default" 0.0;
- align: 1.0 0.5;
- aspect: 1.0 1.0;
- aspect_preference: VERTICAL;
- rel1 {
- offset: 0 3;
- }
- rel2 {
- relative: 0.0 1.0;
- offset: -7 -4;
- to_x: "elm.swallow.end";
- }
- }
- }
- part { name: "elm.swallow.end";
- type: SWALLOW;
- description { state: "default" 0.0;
- align: 1.0 0.5;
- aspect: 1.0 1.0;
- aspect_preference: VERTICAL;
+ description { state: "selected" 0.0;
+ align: 0.0 0.5;
+ min: 0 26;
+ color_class: "select_dark";
rel1 {
relative: 1.0 0.0;
- offset: 0 3;
+ offset: 6 0;
+ to_x: "elm.text";
}
rel2 {
- offset: -7 -4;
- }
- }
- description { state: "hide" 0.0;
- visible: 0;
- align: 1.0 0.5;
- aspect: 1.0 1.0;
- aspect_preference: VERTICAL;
- rel1 {
- relative: 1.0 0.0;
- offset: 0 3;
+ offset: -7 -1;
}
- rel2 {
- offset: -7 -4;
+ text {
+ font: "PT:style=Bold";
+ size: 12;
+ align: 0.0 0.5;
}
}
}
- part { name: "disclip";
- type: RECT;
- repeat_events: 1;
- description { state: "default" 0.0;
- color: 255 255 255 0;
- }
- description { state: "hide" 0.0;
- visible: 0;
- color: 255 255 255 0;
- }
- }
part { name: "arrow";
type: IMAGE;
description { state: "default" 0.0;
@@ -1351,22 +1259,7 @@ group { name: "elm/genlist/tree/item/default";
rel1 {
relative: 1.0 0.0;
offset: 6 0;
- to_x: "elm.swallow.pad";
- }
- image {
- normal: "icon_arrow_right.png";
- middle: DEFAULT;
- }
- }
- description { state: "hide" 0.0;
- visible: 0;
- align: 0.0 0.5;
- max: 14 14;
- color_class: "main";
- rel1 {
- relative: 1.0 0.0;
- offset: 6 0;
- to_x: "elm.swallow.pad";
+ to_x: "elm.swallow.icon";
}
image {
normal: "icon_arrow_right.png";
@@ -1380,7 +1273,7 @@ group { name: "elm/genlist/tree/item/default";
rel1 {
relative: 1.0 0.0;
offset: 6 0;
- to_x: "elm.swallow.pad";
+ to_x: "elm.swallow.icon";
}
image {
normal: "icon_arrow_down.png";
@@ -1388,28 +1281,11 @@ group { name: "elm/genlist/tree/item/default";
}
}
}
- part { name: "elm.text.end";
- type: TEXT;
+ part { name: "disclip";
+ type: RECT;
repeat_events: 1;
description { state: "default" 0.0;
- align: 0.0 0.5;
- min: 0 26;
- color_class: "select";
- rel1 {
- relative: 1.0 0.0;
- offset: 6 0;
- to_x: "elm.text";
- }
- rel2 {
- relative: 0.0 1.0;
- offset: -7 -1;
- to_x: "elm.swallow.penult";
- }
- text {
- font: "PT";
- size: 12;
- align: 0.0 0.5;
- }
+ color: 255 255 255 0;
}
}
}
@@ -1419,43 +1295,38 @@ group { name: "elm/genlist/tree/item/default";
source: "elm";
action: STATE_SET "selected" 0.00;
target: "bg";
+ target: "elm.text.end";
}
program { name: "unselected";
signal: "elm,state,unselected";
source: "elm";
action: STATE_SET "default" 0.00;
target: "bg";
+ target: "elm.text.end";
}
- program { name: "item_hide";
- signal: "elm,state,contract_flip";
- source: "elm";
- action: STATE_SET "hide" 0.00;
- target: "separator";
- target: "elm.swallow.icon";
- target: "elm.swallow.pad";
- target: "arrow";
- target: "elm.text";
- target: "elm.swallow.penult";
- target: "elm.swallow.end";
- target: "disclip";
- }
- program { name: "unreorder";
- signal: "elm,state,reorder,disable";
+ program { name: "go_active";
+ signal: "elm,state,selected";
source: "elm";
action: STATE_SET "selected" 0.00;
target: "bg";
- after: "selected";
}
- program { name: "reorder";
- signal: "elm,state,reorder,enabled";
+ program { name: "go_disabled";
+ signal: "elm,state,disabled";
source: "elm";
- action: STATE_SET "reordered" 0.00;
+ action: STATE_SET "disabled" 0.00;
+ target: "disclip";
+ }
+ program { name: "go_passive";
+ signal: "elm,state,unselected";
+ source: "elm";
+ action: STATE_SET "default" 0.00;
target: "bg";
}
- program { name: "unreordered";
- signal: "elm,state,reorder,disabled";
+ program { name: "go_enabled";
+ signal: "elm,state,enabled";
source: "elm";
- after: "go_active";
+ action: STATE_SET "default" 0.00;
+ target: "disclip";
}
program { name: "expanded_sig";
signal: "mouse,up,1";
@@ -1474,30 +1345,6 @@ group { name: "elm/genlist/tree/item/default";
action: STATE_SET "default" 0.00;
target: "arrow";
}
- program { name: "go_active";
- signal: "elm,state,selected";
- source: "elm";
- action: STATE_SET "selected" 0.00;
- target: "bg";
- }
- program { name: "go_passive";
- signal: "elm,state,unselected";
- source: "elm";
- action: STATE_SET "default" 0.00;
- target: "bg";
- }
- program { name: "go_disabled";
- signal: "elm,state,disabled";
- source: "elm";
- action: STATE_SET "disabled" 0.00;
- target: "disclip";
- }
- program { name: "go_enabled";
- signal: "elm,state,enabled";
- source: "elm";
- action: STATE_SET "default" 0.00;
- target: "disclip";
- }
}
}
diff --git a/src/bin/ui/group_navigator.c b/src/bin/ui/group_navigator.c
index 9839a45..23870f1 100644
--- a/src/bin/ui/group_navigator.c
+++ b/src/bin/ui/group_navigator.c
@@ -1735,7 +1735,7 @@ group_navigator_add(Group *group)
TODO("create new style or fix default (we need to set number at the end)");
pl->itc_caption = elm_genlist_item_class_new();
- pl->itc_caption->item_style = "item";
+ pl->itc_caption->item_style = "caption";
pl->itc_caption->func.text_get = _caption_label_get;
pl->itc_program = elm_genlist_item_class_new();
--
