summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2020-03-02 16:46:06 +0100
committerStefan Schmidt <s.schmidt@samsung.com>2020-03-02 16:54:04 +0100
commit7499bf9ba2b7ecd775dda8c039199673f9cfe944 (patch)
treed46a992ff61f36735c5279767b8a52e2180930ca
parent34477e1cbef63d0369462847ffe9a66659cbb929 (diff)
downloadefl-7499bf9ba2b7ecd775dda8c039199673f9cfe944.tar.gz
Revert "elm_label: sizing eval is called _on_label_resize to ensure label size."
This reverts commit 3d57fc0c92d10337c441ec830361751de510e9b1. The change broke elementary tests on my local machine as well as on CI. Please redo the change and bring it back after testing with the test suites we have.
-rw-r--r--src/lib/elementary/elm_label.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/elementary/elm_label.c b/src/lib/elementary/elm_label.c
index 4f19e36e32..2279955f01 100644
--- a/src/lib/elementary/elm_label.c
+++ b/src/lib/elementary/elm_label.c
@@ -247,8 +247,8 @@ _on_label_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
{
ELM_LABEL_DATA_GET(data, sd);
- elm_layout_sizing_eval(data);
if (sd->slide_mode != ELM_LABEL_SLIDE_MODE_NONE) _label_slide_change(data);
+ if (sd->linewrap) elm_layout_sizing_eval(data);
}
static int