aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Hirt <hirt.danny@gmail.com>2017-07-28 16:39:16 +0300
committerDaniel Hirt <hirt.danny@gmail.com>2017-08-14 20:20:39 +0300
commitcd25e21e6aef3e2dd0ad61c3d22f5e96a36273fa (patch)
treed2cba5e954c7325758102bf6420d0daedba287b2
parentbubble.edc: port to TEXTBLOCK (diff)
downloadefl-cd25e21e6aef3e2dd0ad61c3d22f5e96a36273fa.tar.gz
list.edc: port to TEXTBLOCK
-rw-r--r--data/elementary/themes/colorclasses.edc12
-rw-r--r--data/elementary/themes/edc/elm/list.edc86
2 files changed, 62 insertions, 36 deletions
diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc
index dd6ae9f283..84748f5203 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -466,6 +466,18 @@ color_classes {
color: FN_COL_DISABLE;
desc: "Bubble info";
}
+ color_class { name: "list_item";
+ color: FN_COL_DEFAULT;
+ desc: "Text of an inactive list item";
+ }
+ color_class { name: "list_item_selected";
+ color: FN_COL_HIGHLIGHT;
+ desc: "Text of an active list item";
+ }
+ color_class { name: "list_item_disabled";
+ color: FN_COL_DISABLE;
+ desc: "Text of a disabled list item";
+ }
// modules
color_class { name: "module_label";
diff --git a/data/elementary/themes/edc/elm/list.edc b/data/elementary/themes/edc/elm/list.edc
index 06419383b1..f0c3269151 100644
--- a/data/elementary/themes/edc/elm/list.edc
+++ b/data/elementary/themes/edc/elm/list.edc
@@ -114,6 +114,20 @@
}
group { name: "elm/list/item/default";
+ styles {
+ style { name: "list_item_style";
+ base: STL_COL_PRIMER" font="FN" font_size=10 style=shadow,bottom text_class=list_item color_class=list_item left_margin=2 right_margin=2";
+ ENABLED_TEXTBLOCK_TAGS
+ }
+ style { name: "list_item_disabled_style";
+ base: STL_COL_PRIMER" font="FN" font_size=10 style=shadow,bottom text_class=list_item color_class=list_item_disabled left_margin=2 right_margin=2";
+ ENABLED_TEXTBLOCK_TAGS
+ }
+ style { name: "list_item_selected_style";
+ base: STL_COL_PRIMER" font="FN" font_size=10 style=glow text_class=list_item color_class=list_item_selected left_margin=2 right_margin=2";
+ ENABLED_TEXTBLOCK_TAGS
+ }
+ }
data.item: "selectraise" "on";
data.item: "focusraise" "on";
images.image: "bevel_curved_horiz_out.png" COMP;
@@ -224,8 +238,8 @@ group { name: "elm/list/item/default";
}
//##//
- part { name: "elm.text"; type: TEXT; mouse_events: 0;
- effect: SHADOW BOTTOM;
+ part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 0;
+ //effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
rel1.offset: 2 3;
@@ -234,13 +248,13 @@ group { name: "elm/list/item/default";
rel2.offset: -3 -3;
rel2.relative: 0.0 1.0;
rel2.to_x: "elm.swallow.end";
- color: FN_COL_DEFAULT;
- color_class: "list_item";
- text { font: FN; size: 10;
+ //color: FN_COL_DEFAULT;
+ //color_class: "list_item";
+ text {
+ style: "list_item_style";
min: 1 1;
ellipsis: -1;
align: 0.0 0.5;
- text_class: "list_item";
}
}
description { state: "selected" 0.0;
@@ -252,18 +266,18 @@ group { name: "elm/list/item/default";
visible: 0;
}
}
- part { name: "label2"; type: TEXT; mouse_events: 0;
- effect: SHADOW BOTTOM;
+ part { name: "label2"; type: TEXTBLOCK; mouse_events: 0;
+ //effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
rel1.to: "elm.text";
rel2.to: "elm.text";
- color: FN_COL_DISABLE;
- color_class: "list_item_disabled";
- text { font: FN; size: 10;
+ //color: FN_COL_DISABLE;
+ //color_class: "list_item_disabled";
+ text {
+ style: "list_item_disabled_style";
text_source: "elm.text";
align: 0.0 0.5;
- text_class: "list_item";
}
visible: 0;
}
@@ -276,20 +290,20 @@ group { name: "elm/list/item/default";
visible: 1;
}
}
- part { name: "label3"; type: TEXT; mouse_events: 0;
- effect: GLOW;
+ part { name: "label3"; type: TEXTBLOCK; mouse_events: 0;
+ //effect: GLOW;
scale: 1;
description { state: "default" 0.0;
rel1.offset: -2 -3;
rel1.to: "elm.text";
rel2.offset: 1 1;
rel2.to: "elm.text";
- color: FN_COL_HIGHLIGHT;
- color_class: "list_item_selected";
- text { font: FN; size: 10;
+ //color: FN_COL_HIGHLIGHT;
+ //color_class: "list_item_selected";
+ text {
+ style: "list_item_selected_style";
text_source: "elm.text";
align: 0.0 0.5;
- text_class: "list_item";
}
visible: 0;
}
@@ -535,8 +549,8 @@ group { name: "elm/list/h_item/default";
}
//##//
- part { name: "elm.text"; type: TEXT; mouse_events: 0;
- effect: SHADOW BOTTOM;
+ part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 0;
+ //effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
rel1.offset: 2 2;
@@ -545,13 +559,13 @@ group { name: "elm/list/h_item/default";
rel2.offset: -3 -3;
rel2.relative: 1.0 0.0;
rel2.to_y: "elm.swallow.end";
- color: FN_COL_DEFAULT;
- color_class: "list_item";
- text { font: FN; size: 10;
+ //color: FN_COL_DEFAULT;
+ //color_class: "list_item";
+ text {
+ style: "list_item_style";
min: 1 1;
ellipsis: -1;
align: 0.5 0.5;
- text_class: "list_item";
}
}
description { state: "selected" 0.0;
@@ -563,18 +577,18 @@ group { name: "elm/list/h_item/default";
visible: 0;
}
}
- part { name: "label2"; type: TEXT; mouse_events: 0;
- effect: SHADOW BOTTOM;
+ part { name: "label2"; type: TEXTBLOCK; mouse_events: 0;
+ //effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
rel1.to: "elm.text";
rel2.to: "elm.text";
- color: FN_COL_DISABLE;
- color_class: "list_item_disabled";
- text { font: FN; size: 10;
+ //color: FN_COL_DISABLE;
+ //color_class: "list_item_disabled";
+ text {
+ style: "list_item_disabled_style";
text_source: "elm.text";
align: 0.5 0.5;
- text_class: "list_item";
}
visible: 0;
}
@@ -587,20 +601,20 @@ group { name: "elm/list/h_item/default";
visible: 1;
}
}
- part { name: "label3"; type: TEXT; mouse_events: 0;
- effect: GLOW;
+ part { name: "label3"; type: TEXTBLOCK; mouse_events: 0;
+ //effect: GLOW;
scale: 1;
description { state: "default" 0.0;
rel1.offset: -2 -3;
rel1.to: "elm.text";
rel2.offset: 1 1;
rel2.to: "elm.text";
- color: FN_COL_HIGHLIGHT;
- color_class: "list_item_selected";
- text { font: FN; size: 10;
+ //color: FN_COL_HIGHLIGHT;
+ //color_class: "list_item_selected";
+ text {
+ style: "list_item_selected_style";
text_source: "elm.text";
align: 0.5 0.5;
- text_class: "list_item";
}
visible: 0;
}