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-03-15 11:33:19 +0200
commitf5389d3169c0d846619286f8f2bbf9883355dac3 (patch)
treea4cdd9c4dc2ee588f99ed94653ac0712abe11fd3
parent9e2ddfe118d70782af75362575063ea6e5e7bc4b (diff)
Label: fix _label_format_set calls
-rw-r--r--src/lib/elm_label.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/elm_label.c b/src/lib/elm_label.c
index 53979b4ce..46463f1ba 100644
--- a/src/lib/elm_label.c
+++ b/src/lib/elm_label.c
@@ -147,7 +147,6 @@ _elm_label_elm_widget_theme_apply(Eo *obj, Elm_Label_Data *sd)
147 int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS)); 147 int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
148 if (!int_ret) return EINA_FALSE; 148 if (!int_ret) return EINA_FALSE;
149 149
150 _label_format_set(wd->resize_obj, sd->format);
151 _label_slide_change(obj); 150 _label_slide_change(obj);
152 151
153 evas_event_thaw(evas_object_evas_get(obj)); 152 evas_event_thaw(evas_object_evas_get(obj));
@@ -294,7 +293,7 @@ _elm_label_evas_object_smart_add(Eo *obj, Elm_Label_Data *priv)
294 priv->slide_duration = 10; 293 priv->slide_duration = 10;
295 294
296 priv->format = eina_stringshare_add(""); 295 priv->format = eina_stringshare_add("");
297 _label_format_set(wd->resize_obj, priv->format); 296 _label_format_set(obj, priv->format);
298 297
299 evas_object_event_callback_add(wd->resize_obj, EVAS_CALLBACK_RESIZE, 298 evas_object_event_callback_add(wd->resize_obj, EVAS_CALLBACK_RESIZE,
300 _on_label_resize, obj); 299 _on_label_resize, obj);
@@ -351,7 +350,7 @@ _elm_label_wrap_width_set(Eo *obj, Elm_Label_Data *sd, Evas_Coord w)
351 if (sd->wrap_w == w) return; 350 if (sd->wrap_w == w) return;
352 351
353 if (sd->ellipsis) 352 if (sd->ellipsis)
354 _label_format_set(wd->resize_obj, sd->format); 353 _label_format_set(obj, sd->format);
355 sd->wrap_w = w; 354 sd->wrap_w = w;
356 sd->lastw = -1; 355 sd->lastw = -1;
357 356
@@ -417,7 +416,7 @@ elm_label_ellipsis_set(Evas_Object *obj, Eina_Bool ellipsis)
417 (&sd->format, "ellipsis", eina_strbuf_string_get 416 (&sd->format, "ellipsis", eina_strbuf_string_get
418 (fontbuf), removeflag) == 0) 417 (fontbuf), removeflag) == 0)
419 { 418 {
420 _label_format_set(wd->resize_obj, sd->format); 419 _label_format_set(obj, sd->format);
421 elm_layout_sizing_eval(obj); 420 elm_layout_sizing_eval(obj);
422 } 421 }
423 eina_strbuf_free(fontbuf); 422 eina_strbuf_free(fontbuf);