forked from enlightenment/efl
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
This commit is contained in:
parent
a62d254306
commit
5599f2f70c
|
@ -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";
|
group { name: "elm/label/base/default";
|
||||||
styles {
|
styles {
|
||||||
style { name: "label_style";
|
style { name: "label_style";
|
||||||
|
@ -28,11 +35,7 @@ group { name: "elm/label/base/default";
|
||||||
min: 1 1;
|
min: 1 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
description { state: "horizontal_fixed" 0.0;
|
HORIZONTAL_FIXED
|
||||||
inherit: "default" 0.0;
|
|
||||||
fixed: 1 0;
|
|
||||||
text.min: 0 1;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
programs {
|
programs {
|
||||||
|
@ -62,6 +65,7 @@ group { name: "elm/label/base/default/left";
|
||||||
parts {
|
parts {
|
||||||
textblock { "elm.text";
|
textblock { "elm.text";
|
||||||
desc { "default"; text.style: "label_style_left"; }
|
desc { "default"; text.style: "label_style_left"; }
|
||||||
|
HORIZONTAL_FIXED
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -79,6 +83,7 @@ group { name: "elm/label/base/default/right";
|
||||||
parts {
|
parts {
|
||||||
textblock { "elm.text";
|
textblock { "elm.text";
|
||||||
desc { "default"; text.style: "label_style_right"; }
|
desc { "default"; text.style: "label_style_right"; }
|
||||||
|
HORIZONTAL_FIXED
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -509,3 +514,4 @@ group { name: "elm/label/base/slide_bounce";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#undef HORIZONTAL_FIXED
|
||||||
|
|
Loading…
Reference in New Issue