diff --git a/legacy/elementary/data/themes/widgets/label.edc b/legacy/elementary/data/themes/widgets/label.edc index f8c69c90e8..8d939da687 100644 --- a/legacy/elementary/data/themes/widgets/label.edc +++ b/legacy/elementary/data/themes/widgets/label.edc @@ -136,7 +136,7 @@ group { name: "elm/label/base/slide_long"; align: 0.0 0.0; text { style: "textblock_style"; - min: 1 1; + min: 0 1; } } description { state: "slide_end" 0.0; @@ -144,12 +144,20 @@ group { name: "elm/label/base/slide_long"; rel1.relative: 0.0 0.0; rel2.relative: 0.0 1.0; align: 1.0 0.0; + text { + style: "textblock_style"; + min: 1 1; + } } description { state: "slide_begin" 0.0; inherit: "default" 0.0; rel1.relative: 1.0 0.0; rel2.relative: 1.0 1.0; align: 0.0 0.0; + text { + style: "textblock_style"; + min: 1 1; + } } } } @@ -252,7 +260,7 @@ group { name: "elm/label/base/slide_short"; align: 0.0 0.0; text { style: "textblock_style"; - min: 1 1; + min: 0 1; } } description { state: "slide_end" 0.0; @@ -260,12 +268,20 @@ group { name: "elm/label/base/slide_short"; rel1.relative: 1.0 0.0; rel2.relative: 1.0 1.0; align: 1.0 0.0; + text { + style: "textblock_style"; + min: 1 1; + } } description { state: "slide_begin" 0.0; inherit: "default" 0.0; rel1.relative: 0.0 0.0; rel2.relative: 0.0 1.0; align: 0.0 0.0; + text { + style: "textblock_style"; + min: 1 1; + } } } } @@ -379,7 +395,7 @@ group { name: "elm/label/base/slide_bounce"; align: 0.0 0.0; text { style: "textblock_style"; - min: 1 1; + min: 0 1; } } description { state: "slide_end" 0.0; @@ -387,12 +403,20 @@ group { name: "elm/label/base/slide_bounce"; rel1.relative: 1.0 0.0; rel2.relative: 1.0 1.0; align: 1.0 0.0; + text { + style: "textblock_style"; + min: 1 1; + } } description { state: "slide_begin" 0.0; inherit: "default" 0.0; rel1.relative: 0.0 0.0; rel2.relative: 0.0 1.0; align: 0.0 0.0; + text { + style: "textblock_style"; + min: 1 1; + } } } } diff --git a/legacy/elementary/src/lib/elm_label.c b/legacy/elementary/src/lib/elm_label.c index 5d45e939ce..04b02f8a53 100644 --- a/legacy/elementary/src/lib/elm_label.c +++ b/legacy/elementary/src/lib/elm_label.c @@ -83,7 +83,6 @@ _label_slide_change(Evas_Object *obj) //doesn't support multiline slide effect if (sd->linewrap) { - sd->slide_mode = ELM_LABEL_SLIDE_MODE_NONE; WRN("Doesn't support slide effect for multiline! : label=%p", obj); return; } @@ -96,11 +95,7 @@ _label_slide_change(Evas_Object *obj) plainlen = strlen(plaintxt); free(plaintxt); } - if (plainlen < 1) - { - sd->slide_mode = ELM_LABEL_SLIDE_MODE_NONE; - return; - } + if (plainlen < 1) return; //has slide effect. if (sd->slide_mode != ELM_LABEL_SLIDE_MODE_NONE) @@ -117,11 +112,7 @@ _label_slide_change(Evas_Object *obj) evas_object_textblock_size_formatted_get(tb, &tb_w, NULL); evas_object_geometry_get(wd->resize_obj, NULL, NULL, &w, NULL); - if ((tb_w > 0) && (tb_w < w)) - { - sd->slide_mode = ELM_LABEL_SLIDE_MODE_NONE; - return; - } + if ((tb_w > 0) && (tb_w < w)) return; } } Edje_Message_Float_Set *msg = @@ -363,6 +354,11 @@ static void _on_slide_end(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) { + ELM_LABEL_DATA_GET(data, sd); + + if (sd->slide_ellipsis) + eo_do(data, elm_obj_label_ellipsis_set(EINA_TRUE)); + evas_object_smart_callback_call(data, SIG_SLIDE_END, NULL); }