summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Hirt <daniel.hirt@samsung.com>2016-03-14 10:22:04 +0200
committerDaniel Hirt <daniel.hirt@samsung.com>2016-04-04 17:33:23 +0300
commitf8c317160b975ff3cf1caf1bfc045c150cc04ee2 (patch)
treeb4c27c5ae6cc725b0509898634675867b6b0f6cf
parent990eebeae3e17938c3cd4ce1d2c32f927a287854 (diff)
downloadefl-f8c317160b975ff3cf1caf1bfc045c150cc04ee2.tar.gz
Label: fix _label_format_set calls
-rw-r--r--src/lib/elementary/elm_label.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/elementary/elm_label.c b/src/lib/elementary/elm_label.c
index d8e3b5ef18..613a9972fe 100644
--- a/src/lib/elementary/elm_label.c
+++ b/src/lib/elementary/elm_label.c
@@ -147,7 +147,6 @@ _elm_label_elm_widget_theme_apply(Eo *obj, Elm_Label_Data *sd)
int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
if (!int_ret) return EINA_FALSE;
- _label_format_set(wd->resize_obj, sd->format);
_label_slide_change(obj);
evas_event_thaw(evas_object_evas_get(obj));
@@ -313,7 +312,7 @@ _elm_label_evas_object_smart_add(Eo *obj, Elm_Label_Data *priv)
priv->slide_duration = 10;
priv->format = eina_stringshare_add("");
- _label_format_set(wd->resize_obj, priv->format);
+ _label_format_set(obj, priv->format);
evas_object_event_callback_add(wd->resize_obj, EVAS_CALLBACK_RESIZE,
_on_label_resize, obj);
@@ -370,7 +369,7 @@ _elm_label_wrap_width_set(Eo *obj, Elm_Label_Data *sd, Evas_Coord w)
if (sd->wrap_w == w) return;
if (sd->ellipsis)
- _label_format_set(wd->resize_obj, sd->format);
+ _label_format_set(obj, sd->format);
sd->wrap_w = w;
sd->lastw = -1;
@@ -436,7 +435,7 @@ elm_label_ellipsis_set(Evas_Object *obj, Eina_Bool ellipsis)
(&sd->format, "ellipsis", eina_strbuf_string_get
(fontbuf), removeflag) == 0)
{
- _label_format_set(wd->resize_obj, sd->format);
+ _label_format_set(obj, sd->format);
elm_layout_sizing_eval(obj);
}
eina_strbuf_free(fontbuf);