summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael BOUCHAUD <michael.bouchaud@gmail.com>2012-11-22 10:17:24 +0000
committerMichael BOUCHAUD <michael.bouchaud@gmail.com>2012-11-22 10:17:24 +0000
commitd4e36a7dc239e052735fcbfed93c5a3e169b440b (patch)
treedc7ed878048d6ccc830827e7227f7389387b16da
parentcb9929612e329db9ee78aa0f729af74ea366b587 (diff)
elementary: backport update the min size hint on elm_label after a text set
SVN revision: 79534
-rw-r--r--ChangeLog4
-rw-r--r--NEWS1
-rw-r--r--src/lib/elm_label.c9
3 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 61d9e67f4..2a9c8ab9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -522,3 +522,7 @@
5222012-10-25 Michael Bouchaud (yoz) 5222012-10-25 Michael Bouchaud (yoz)
523 523
524 * Add missing selected event in elm_index (elm_index_item_selected_set) 524 * Add missing selected event in elm_index (elm_index_item_selected_set)
525
5262012-11-14 Michael Bouchaud (yoz)
527
528 * update the min size hint on elm_label after a text set
diff --git a/NEWS b/NEWS
index 311f782bf..eadbc54a5 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@ Fixes:
9 * Fix the elm_flip to accept proxy object. 9 * Fix the elm_flip to accept proxy object.
10 * Fix wrong parameter for thumbnail error in elm_icon. 10 * Fix wrong parameter for thumbnail error in elm_icon.
11 * Fix missing event selected in elm_index (elm_index_item_selected_set) 11 * Fix missing event selected in elm_index (elm_index_item_selected_set)
12 * Fix update the min size hint on elm_label after a text set
12 13
13 14
14Changes since Elementary 1.7.0: 15Changes since Elementary 1.7.0:
diff --git a/src/lib/elm_label.c b/src/lib/elm_label.c
index e40825d0e..5d7b22732 100644
--- a/src/lib/elm_label.c
+++ b/src/lib/elm_label.c
@@ -293,7 +293,14 @@ _elm_label_smart_text_set(Evas_Object *obj,
293 if (!label) label = ""; 293 if (!label) label = "";
294 _label_format_set(ELM_WIDGET_DATA(sd)->resize_obj, sd->format); 294 _label_format_set(ELM_WIDGET_DATA(sd)->resize_obj, sd->format);
295 295
296 return _elm_label_parent_sc->text_set(obj, item, label); 296 if (_elm_label_parent_sc->text_set(obj, item, label))
297 {
298 sd->lastw = 0;
299 _elm_label_smart_sizing_eval(obj);
300 return EINA_TRUE;
301 }
302
303 return EINA_FALSE;
297} 304}
298 305
299static Eina_Bool 306static Eina_Bool