hermet pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=5599f2f70ce18ce2fc042a6e95cf183f06d99d60
commit 5599f2f70ce18ce2fc042a6e95cf183f06d99d60 Author: Daniel Hirt <[email protected]> Date: Fri Jun 29 10:25:57 2018 +0900 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 --- data/elementary/themes/edc/elm/label.edc | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/data/elementary/themes/edc/elm/label.edc b/data/elementary/themes/edc/elm/label.edc index 99227d8067..477f4cbad5 100644 --- a/data/elementary/themes/edc/elm/label.edc +++ b/data/elementary/themes/edc/elm/label.edc @@ -1,3 +1,10 @@ +#define HORIZONTAL_FIXED \ + description { state: "horizontal_fixed" 0.0; \ + inherit: "default" 0.0; \ + fixed: 1 0; \ + text.min: 0 1; \ + } + group { name: "elm/label/base/default"; styles { style { name: "label_style"; @@ -28,11 +35,7 @@ group { name: "elm/label/base/default"; min: 1 1; } } - description { state: "horizontal_fixed" 0.0; - inherit: "default" 0.0; - fixed: 1 0; - text.min: 0 1; - } + HORIZONTAL_FIXED } } programs { @@ -62,6 +65,7 @@ group { name: "elm/label/base/default/left"; parts { textblock { "elm.text"; desc { "default"; text.style: "label_style_left"; } + HORIZONTAL_FIXED } } } @@ -79,6 +83,7 @@ group { name: "elm/label/base/default/right"; parts { textblock { "elm.text"; desc { "default"; text.style: "label_style_right"; } + HORIZONTAL_FIXED } } } @@ -509,3 +514,4 @@ group { name: "elm/label/base/slide_bounce"; } } } +#undef HORIZONTAL_FIXED --
