aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Hirt <hirt.danny@gmail.com>2017-07-28 16:22:25 +0300
committerDaniel Hirt <hirt.danny@gmail.com>2017-08-14 20:20:39 +0300
commit2b7c2c535b8588cbebe6f47bc63176b293123405 (patch)
tree5e58edc8cef8b4d3d3b1dbb9fa4c4b646d431485
parentmultibuttonentry.edc: port to TEXTBLOCK (diff)
downloadefl-2b7c2c535b8588cbebe6f47bc63176b293123405.tar.gz
bubble.edc: port to TEXTBLOCK
-rw-r--r--data/elementary/themes/colorclasses.edc8
-rw-r--r--data/elementary/themes/edc/elm/bubble.edc133
2 files changed, 83 insertions, 58 deletions
diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc
index 5af3d46f25..dd6ae9f283 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -458,6 +458,14 @@ color_classes {
color: FN_COL_HIGHLIGHT;
desc: "Multibuttoentry label";
}
+ color_class { name: "bubble_text";
+ color: FN_COL_DEFAULT;
+ desc: "Bubble text";
+ }
+ color_class { name: "bubble_info";
+ color: FN_COL_DISABLE;
+ desc: "Bubble info";
+ }
// modules
color_class { name: "module_label";
diff --git a/data/elementary/themes/edc/elm/bubble.edc b/data/elementary/themes/edc/elm/bubble.edc
index 4fd5a28025..f16708598c 100644
--- a/data/elementary/themes/edc/elm/bubble.edc
+++ b/data/elementary/themes/edc/elm/bubble.edc
@@ -1,4 +1,14 @@
group { name: "elm/bubble/top_left/default";
+ styles {
+ style { name: "bubble_style";
+ base: STL_COL_PRIMER" font="FN" font_size=10 style=shadow,bottom text_class=bubble color_class=bubble_text left_margin=2 right_margin=2 align=0.5 ellipsis=1.0";
+ ENABLED_TEXTBLOCK_TAGS
+ }
+ style { name: "bubble_info_style";
+ base: STL_COL_PRIMER" font="FNBD" font_size=10 style=shadow,bottom text_class=bubble_info color_class=bubble_info left_margin=2 right_margin=2 align=1.0 ellipsis=1.0";
+ ENABLED_TEXTBLOCK_TAGS
+ }
+ }
alias: "elm/bubble/base/default";
images.image: "bub_base_tl.png" COMP;
images.image: "bub_base_tr.png" COMP;
@@ -28,14 +38,14 @@ group { name: "elm/bubble/top_left/default";
visible: 1;
}
}
- part { name: "sizer.content"; type: TEXT; mouse_events: 0;
+ part { name: "sizer.content"; type: TEXTBLOCK; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
visible: 0;
- text { font: FN; size: 10;
+ text {
+ style: "bubble_style";
min: 0 0;
- text_class: "bubble";
}
}
description { state: "visible" 0.0;
@@ -49,7 +59,7 @@ group { name: "elm/bubble/top_left/default";
}
}
}
- part { name: "elm.text"; type: TEXT; mouse_events: 0;
+ part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 0;
effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
@@ -65,18 +75,19 @@ group { name: "elm/bubble/top_left/default";
relative: 0.0 0.0;
offset: -3 2;
}
- color: FN_COL_DEFAULT;
- color_class: "bubble_text";
- text { font: FNBD; size: 10;
+ //color: FN_COL_DEFAULT;
+ //color_class: "bubble_text";
+ text {
+ style: "bubble_style";
+ font: FNBD;
min: 0 1;
max: 0 1;
align: 0.0 0.0;
- text_class: "bubble";
}
}
}
- part { name: "elm.info"; type: TEXT; mouse_events: 0;
- effect: SHADOW BOTTOM;
+ part { name: "elm.info"; type: TEXTBLOCK; mouse_events: 0;
+ //effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
align: 1.0 0.0;
@@ -85,14 +96,14 @@ group { name: "elm/bubble/top_left/default";
rel1.offset: -3 2;
rel2.relative: 1.0 0.0;
rel2.offset: -3 2;
- color: FN_COL_DISABLE;
- color_class: "bubble_info";
- text { font: FNBD; size: 10;
+ //color: FN_COL_DISABLE;
+ //color_class: "bubble_info";
+ text {
+ style: "bubble_info_style";
min: 1 1;
ellipsis: -1;
max: 1 1;
align: 1.0 0.0;
- text_class: "bubble_info";
}
}
}
@@ -217,14 +228,14 @@ group { name: "elm/bubble/top_right/default";
visible: 1;
}
}
- part { name: "sizer.content"; type: TEXT; mouse_events: 0;
+ part { name: "sizer.content"; type: TEXTBLOCK; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
visible: 0;
- text { font: FN; size: 10;
+ text {
+ style: "bubble_style";
min: 0 0;
- text_class: "bubble";
}
}
description { state: "visible" 0.0;
@@ -238,8 +249,8 @@ group { name: "elm/bubble/top_right/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;
fixed: 0 1;
@@ -250,17 +261,18 @@ group { name: "elm/bubble/top_right/default";
relative: 0.0 0.0;
offset: -3 2;
}
- color: FN_COL_DEFAULT;
- color_class: "bubble_text";
- text { font: FNBD; size: 10;
+ //color: FN_COL_DEFAULT;
+ //color_class: "bubble_text";
+ text {
+ style: "bubble_style";
+ font: FNBD;
min: 0 1;
max: 0 1;
align: 0.0 0.0;
- text_class: "bubble";
}
}
}
- part { name: "elm.info"; type: TEXT; mouse_events: 0;
+ part { name: "elm.info"; type: TEXTBLOCK; mouse_events: 0;
effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
@@ -271,14 +283,14 @@ group { name: "elm/bubble/top_right/default";
rel2.to_x: "elm.swallow.icon";
rel2.relative: 0.0 0.0;
rel2.offset: -3 2;
- color: FN_COL_DISABLE;
- color_class: "bubble_info";
- text { font: FNBD; size: 10;
+ //color: FN_COL_DISABLE;
+ //color_class: "bubble_info";
+ text {
+ style: "bubble_info_style";
min: 1 1;
ellipsis: -1;
max: 1 1;
align: 1.0 0.0;
- text_class: "bubble_info";
}
}
}
@@ -404,14 +416,14 @@ group { name: "elm/bubble/bottom_left/default";
visible: 1;
}
}
- part { name: "sizer.content"; type: TEXT; mouse_events: 0;
+ part { name: "sizer.content"; type: TEXTBLOCK; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
visible: 0;
- text { font: FN; size: 10;
+ text {
+ style: "bubble_style";
min: 0 0;
- text_class: "bubble";
}
}
description { state: "visible" 0.0;
@@ -425,8 +437,8 @@ group { name: "elm/bubble/bottom_left/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;
fixed: 0 1;
@@ -441,18 +453,19 @@ group { name: "elm/bubble/bottom_left/default";
relative: 0.0 1.0;
offset: -3 -3;
}
- color: FN_COL_DEFAULT;
- color_class: "bubble_text";
- text { font: FNBD; size: 10;
+ //color: FN_COL_DEFAULT;
+ //color_class: "bubble_text";
+ text {
+ style: "bubble_style";
+ font: FNBD;
min: 0 1;
max: 0 1;
align: 0.0 1.0;
- text_class: "bubble";
}
}
}
- part { name: "elm.info"; type: TEXT; mouse_events: 0;
- effect: SHADOW BOTTOM;
+ part { name: "elm.info"; type: TEXTBLOCK; mouse_events: 0;
+ //effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
align: 1.0 1.0;
@@ -461,14 +474,14 @@ group { name: "elm/bubble/bottom_left/default";
rel1.offset: -3 -3;
rel2.relative: 1.0 1.0;
rel2.offset: -3 -3;
- color: FN_COL_DISABLE;
- color_class: "bubble_info";
- text { font: FNBD; size: 10;
+ //color: FN_COL_DISABLE;
+ //color_class: "bubble_info";
+ text {
+ style: "bubble_info_style";
min: 1 1;
ellipsis: -1;
max: 1 1;
align: 1.0 1.0;
- text_class: "bubble_info";
}
}
}
@@ -586,14 +599,15 @@ group { name: "elm/bubble/bottom_right/default";
visible: 1;
}
}
- part { name: "sizer.content"; type: TEXT; mouse_events: 0;
+ part { name: "sizer.content"; type: TEXTBLOCK; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
visible: 0;
- text { font: FN; size: 10;
+ text {
+ style: "bubble_style";
min: 0 0;
- text_class: "bubble";
+ //text_class: "bubble";
}
}
description { state: "visible" 0.0;
@@ -607,8 +621,8 @@ group { name: "elm/bubble/bottom_right/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;
fixed: 0 1;
@@ -622,18 +636,20 @@ group { name: "elm/bubble/bottom_right/default";
relative: 0.0 1.0;
offset: -3 -3;
}
- color: FN_COL_DEFAULT;
- color_class: "bubble_text";
- text { font: FNBD; size: 10;
+ //color: FN_COL_DEFAULT;
+ //color_class: "bubble_text";
+ text {
+ style: "bubble_style";
+ font: FNBD;
min: 0 1;
max: 0 1;
align: 0.0 1.0;
- text_class: "bubble";
+ //text_class: "bubble";
}
}
}
- part { name: "elm.info"; type: TEXT; mouse_events: 0;
- effect: SHADOW BOTTOM;
+ part { name: "elm.info"; type: TEXTBLOCK; mouse_events: 0;
+ //effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
align: 1.0 1.0;
@@ -643,14 +659,15 @@ group { name: "elm/bubble/bottom_right/default";
rel2.to_x: "elm.swallow.icon";
rel2.relative: 0.0 1.0;
rel2.offset: -3 -3;
- color: FN_COL_DISABLE;
- color_class: "bubble_info";
- text { font: FNBD; size: 10;
+ //color: FN_COL_DISABLE;
+ //color_class: "bubble_info";
+ text {
+ style: "bubble_info_style";
min: 1 1;
ellipsis: -1;
max: 1 1;
align: 1.0 1.0;
- text_class: "bubble_info";
+ //text_class: "bubble_info";
}
}
}