summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorDaniel Hirt <hirt.danny@gmail.com>2018-06-29 10:25:57 +0900
committerHermet Park <hermetpark@gmail.com>2018-06-29 10:25:57 +0900
commit5599f2f70ce18ce2fc042a6e95cf183f06d99d60 (patch)
treec680b0246bdb0f153f2baf6244791c6a519e370e /data
parenta62d254306b6045039d9b8d18ea19dcfe7855c05 (diff)
Elm label: fix "horizontal_fixed" usage with different styles
Summary: This adds the "horizontal_fixed" description to each of the inheriting parts in their respective inheriting groups "left" and "right". An issue was observed when an emitted signal caused the part's description to change to the one inherited from the "default" group. Fixes T5382 @fix Reviewers: #committers, devilhorns, Hermet Reviewed By: #committers, Hermet Subscribers: cedric, zmike Tags: #efl Maniphest Tasks: T5382 Differential Revision: https://phab.enlightenment.org/D6467
Diffstat (limited to 'data')
-rw-r--r--data/elementary/themes/edc/elm/label.edc16
1 files changed, 11 insertions, 5 deletions
diff --git a/data/elementary/themes/edc/elm/label.edc b/data/elementary/themes/edc/elm/label.edc
index 99227d8..477f4cb 100644
--- a/data/elementary/themes/edc/elm/label.edc
+++ b/data/elementary/themes/edc/elm/label.edc
@@ -1,3 +1,10 @@
1#define HORIZONTAL_FIXED \
2 description { state: "horizontal_fixed" 0.0; \
3 inherit: "default" 0.0; \
4 fixed: 1 0; \
5 text.min: 0 1; \
6 }
7
1group { name: "elm/label/base/default"; 8group { name: "elm/label/base/default";
2 styles { 9 styles {
3 style { name: "label_style"; 10 style { name: "label_style";
@@ -28,11 +35,7 @@ group { name: "elm/label/base/default";
28 min: 1 1; 35 min: 1 1;
29 } 36 }
30 } 37 }
31 description { state: "horizontal_fixed" 0.0; 38 HORIZONTAL_FIXED
32 inherit: "default" 0.0;
33 fixed: 1 0;
34 text.min: 0 1;
35 }
36 } 39 }
37 } 40 }
38 programs { 41 programs {
@@ -62,6 +65,7 @@ group { name: "elm/label/base/default/left";
62 parts { 65 parts {
63 textblock { "elm.text"; 66 textblock { "elm.text";
64 desc { "default"; text.style: "label_style_left"; } 67 desc { "default"; text.style: "label_style_left"; }
68 HORIZONTAL_FIXED
65 } 69 }
66 } 70 }
67} 71}
@@ -79,6 +83,7 @@ group { name: "elm/label/base/default/right";
79 parts { 83 parts {
80 textblock { "elm.text"; 84 textblock { "elm.text";
81 desc { "default"; text.style: "label_style_right"; } 85 desc { "default"; text.style: "label_style_right"; }
86 HORIZONTAL_FIXED
82 } 87 }
83 } 88 }
84} 89}
@@ -509,3 +514,4 @@ group { name: "elm/label/base/slide_bounce";
509 } 514 }
510 } 515 }
511} 516}
517#undef HORIZONTAL_FIXED