aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Hirt <hirt.danny@gmail.com>2017-07-26 15:44:50 +0300
committerDaniel Hirt <hirt.danny@gmail.com>2017-08-14 20:20:38 +0300
commit4f71a7b6c88b6a6f18fb8ad3fdb1e16ec2e5100b (patch)
treeda640e5293c7322fe04f4819baa55232b84592e9
parentframe.edc: port to textblock (diff)
downloadefl-4f71a7b6c88b6a6f18fb8ad3fdb1e16ec2e5100b.tar.gz
map.edc: port to textblock
-rw-r--r--data/elementary/themes/colorclasses.edc12
-rw-r--r--data/elementary/themes/edc/elm/map.edc54
2 files changed, 48 insertions, 18 deletions
diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc
index 36250971fc..07c67847cd 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -40,6 +40,18 @@ color_classes {
color: FN_COL_DEFAULT;
desc: "Info text while resizing a window";
}
+ color_class { name: "map_radio";
+ color: FN_COL_DISABLE_SHADOW;
+ desc: "Base color of a map";
+ }
+ color_class { name: "map_empty";
+ color: FN_COL_DEFAULT;
+ desc: "Base color of a menu";
+ }
+ color_class { name: "map_scale";
+ color: FN_COL_DEFAULT;
+ desc: "Base color of a menu";
+ }
color_class { name: "menu_base";
color: WIN_DEFAULT_BASIC;
desc: "Base color of a menu";
diff --git a/data/elementary/themes/edc/elm/map.edc b/data/elementary/themes/edc/elm/map.edc
index c84533e744..00ee8b1a46 100644
--- a/data/elementary/themes/edc/elm/map.edc
+++ b/data/elementary/themes/edc/elm/map.edc
@@ -3,6 +3,12 @@ group { name: "elm/map/base/default";
}
group { name: "elm/map/marker/radio/default";
+ styles {
+ style { name: "map_radio_style";
+ base: STL_COL_PRIMER" font="FN" font_size=10 style=shadow,bottom text_class=map_radio color_class=map_radio left_margin=2 right_margin=2 align=center";
+ ENABLED_TEXTBLOCK_TAGS
+ }
+ }
data.item: "size_w" 35;
data.item: "size_h" 35;
data.item: "size_max_w" 35;
@@ -31,16 +37,15 @@ group { name: "elm/map/marker/radio/default";
rel2.offset: 0 0;
}
}
- part { name: "elm.text"; type: TEXT;
- effect: SHADOW BOTTOM;
+ part { name: "elm.text"; type: TEXTBLOCK;
description { state: "default" 0.0;
fixed: 1 1;
rel1.to: "elm.icon";
rel2.to: "elm.icon";
- color_class: "map_radio";
- color: FN_COL_DISABLE_SHADOW;
- text { font: FNBD; size: 10;
- text_class: "map_radio";
+ //color_class: "map_radio";
+ //color: FN_COL_DISABLE;
+ text { style: "map_radio_style";
+ font: FNBD; size: 10;
min: 1 1;
ellipsis: -1;
}
@@ -50,6 +55,12 @@ group { name: "elm/map/marker/radio/default";
}
group { name: "elm/map/marker/empty/default";
+ styles {
+ style { name: "map_empty_style";
+ base: STL_COL_PRIMER" font="FN" font_size=10 style=shadow,bottom text_class=map_empty color_class=map_empty left_margin=2 right_margin=2 align=center";
+ ENABLED_TEXTBLOCK_TAGS
+ }
+ }
data.item: "size_w" 16;
data.item: "size_h" 16;
data.item: "size_max_w" 24;
@@ -67,15 +78,15 @@ group { name: "elm/map/marker/empty/default";
rel2.to: "knob";
}
}
- part { name: "elm.text"; type: TEXT;
- effect: SHADOW BOTTOM;
+ part { name: "elm.text"; type: TEXTBLOCK;
+ //effect: SHADOW BOTTOM;
description { state: "default" 0.0;
rel1.to: "knob";
rel2.to: "knob";
- color_class: "map_empty";
- color: FN_COL_DEFAULT;
- text { font: FNBD; size: 10;
- text_class: "map_empty";
+ //color_class: "map_empty";
+ //color: FN_COL_DEFAULT;
+ text { style: "map_style";
+ font: FNBD; size: 10;
min: 1 1;
ellipsis: -1;
}
@@ -97,6 +108,12 @@ group { name: "elm/map/circle/base/default";
}
group { name: "elm/map/scale/base/default";
+ styles {
+ style { name: "map_scale_style";
+ base: STL_COL_PRIMER" font="FN" font_size=10 style=shadow,bottom text_class=map_scale color_class=map_scale left_margin=2 right_margin=2 align=center";
+ ENABLED_TEXTBLOCK_TAGS
+ }
+ }
data.item: "size_w" 100;
data.item: "size_h" 22;
images.image: "map_scale.png" COMP;
@@ -108,15 +125,16 @@ group { name: "elm/map/scale/base/default";
image.normal: "map_scale.png";
}
}
- part { name: "elm.text"; type: TEXT;
- effect: SHADOW BOTTOM;
+ part { name: "elm.text"; type: TEXTBLOCK;
+ //effect: SHADOW BOTTOM;
description { state: "default" 0.0;
rel1.offset: 6 5;
rel2.offset: -7 -5;
- color_class: "map_scale";
- color: FN_COL_DEFAULT;
- text { font: FNBD; size: 10;
- text_class: "map_scale";
+ //color_class: "map_scale";
+ //color: FN_COL_DEFAULT;
+ text { style: "map_scale_style";
+ //text_class: "map_scale";
+ font: FNBD; size: 10;
min: 1 1;
ellipsis: -1;
align: 0.0 0.0;