From 923765d6ba3463f7f9338f6504f96c655e836221 Mon Sep 17 00:00:00 2001 From: Michael BOUCHAUD Date: Wed, 21 Nov 2012 17:09:44 +0000 Subject: [PATCH] elementary: update the min size hint on elm_label after a text set SVN revision: 79517 --- legacy/elementary/ChangeLog | 4 ++++ legacy/elementary/NEWS | 1 + legacy/elementary/src/lib/elm_label.c | 9 ++++++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog index 40c5b262d8..b53484a2e0 100644 --- a/legacy/elementary/ChangeLog +++ b/legacy/elementary/ChangeLog @@ -688,3 +688,7 @@ * Support indicator service in elm_conformant. elm conformant can manage indicator(elm_plug). + +2012-11-14 Michael Bouchaud (yoz) + + * update the min size hint on elm_label after a text set diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS index 421cc46302..d9b040489a 100644 --- a/legacy/elementary/NEWS +++ b/legacy/elementary/NEWS @@ -58,6 +58,7 @@ Fixes: * Fix wrong parameter for thumbnail error in elm_icon. * Fix missing selected event in elm_index (elm_index_item_selected_set) * Fix the elm_image which is made up of a edje object can call a callback function + * Fix update the min size hint on elm_label after a text set Removals: diff --git a/legacy/elementary/src/lib/elm_label.c b/legacy/elementary/src/lib/elm_label.c index e40825d0e9..5d7b22732c 100644 --- a/legacy/elementary/src/lib/elm_label.c +++ b/legacy/elementary/src/lib/elm_label.c @@ -293,7 +293,14 @@ _elm_label_smart_text_set(Evas_Object *obj, if (!label) label = ""; _label_format_set(ELM_WIDGET_DATA(sd)->resize_obj, sd->format); - return _elm_label_parent_sc->text_set(obj, item, label); + if (_elm_label_parent_sc->text_set(obj, item, label)) + { + sd->lastw = 0; + _elm_label_smart_sizing_eval(obj); + return EINA_TRUE; + } + + return EINA_FALSE; } static Eina_Bool