Revert "Temp: Remove Tizen Only Size Calculation Code in Elm_Label for Efl Sharp...

This reverts commit 0ff0d06ab44d6c5fdc173cb06cda3590a08b051c.

Change-Id: I4d7370e8c99da3c729009c1a7af170fca9a3d92f

diff --git a/src/lib/elementary/elm_label.c b/src/lib/elementary/elm_label.c
index aa51ed6..42eb947 100644 (file)
--- a/src/lib/elementary/elm_label.c
+++ b/src/lib/elementary/elm_label.c
@@ -51,10 +51,29 @@ _recalc(void *data)
 
    /* If wrap_w is not set, label's width has to be controlled
       by outside of label. So, we don't need to set minimum width. */
+   /* TIZEN_ONLY(20180511): restore label size calc logic from Tizen 4.0
    if (sd->wrap_w == -1)
      evas_object_size_hint_min_set(data, 0, minh);
    else
      evas_object_size_hint_min_set(data, minw, minh);
+    */
+   if ((minw <= resw) && (minw != sd->wrap_w))
+     {
+        Evas_Coord ominw = -1;
+
+        evas_object_size_hint_min_get(data, &ominw, NULL);
+        minw = ominw;
+     }
+
+   evas_object_size_hint_min_set(data, minw, minh);
+   /* END */
+
+   /* TIZEN_ONLY(20161109): wrap width will work as min and max width */
+   if (sd->wrap_w > 0)
+     evas_object_size_hint_max_set(data, minw, -1);
+   else
+     evas_object_size_hint_max_set(data, -1, -1);
+   /* END */
 
    evas_event_thaw(evas_object_evas_get(data));
    evas_event_thaw_eval(evas_object_evas_get(data));