From: Youngbok Shin <youngb.shin@samsung.com>
Date: Tue, 27 Dec 2016 07:57:32 +0000 (+0900)
Subject: label: don't make ellipsis/slide label as expandable
X-Git-Tag: submit/tizen/20170102.091821~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9d0d96eb65c15916ef5750aee41b233c62bbe996;p=platform%2Fupstream%2Felementary.git

label: don't make ellipsis/slide label as expandable

@tizen_fix

Change-Id: Ic85c84277ba65eb3a852ebc76f5d58a9d5990afb
---

diff --git a/src/lib/elm_label.c b/src/lib/elm_label.c
index 9eb8d6769..595d56233 100644
--- a/src/lib/elm_label.c
+++ b/src/lib/elm_label.c
@@ -189,7 +189,7 @@ _elm_label_horizontal_size_policy_update(Eo *obj, Elm_Label_Data *sd)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   if (!sd->ellipsis && (sd->linewrap == ELM_WRAP_NONE))
+   if (!sd->ellipsis && (sd->linewrap == ELM_WRAP_NONE) && (sd->slide_mode == ELM_LABEL_SLIDE_MODE_NONE))
      edje_object_signal_emit(wd->resize_obj, "elm,state,horizontal,expandable", "elm");
    else
      edje_object_signal_emit(wd->resize_obj, "elm,state,horizontal,fixed", "elm");
@@ -251,7 +251,8 @@ _elm_label_elm_layout_sizing_eval(Eo *obj, Elm_Label_Data *_pd EINA_UNUSED)
         Eina_Bool min_x, min_y;
         Eina_Bool policy_set_ret = EINA_FALSE;
 
-        if (edje_object_part_text_min_policy_get(wd->resize_obj, "elm.text", "default", &min_x, &min_y))
+        if (!sd->ellipsis && (sd->slide_mode == ELM_LABEL_SLIDE_MODE_NONE) &&
+            edje_object_part_text_min_policy_get(wd->resize_obj, "elm.text", "default", &min_x, &min_y))
           {
              /* If min policy for width is 0, it couldn't be expanded.
                 It uses legacy theme. */
@@ -624,6 +625,11 @@ EOLIAN static void
 _elm_label_slide_mode_set(Eo *obj EINA_UNUSED, Elm_Label_Data *sd, Elm_Label_Slide_Mode mode)
 {
    sd->slide_mode = mode;
+
+   /* TIZEN_ONLY(20161227): don't make ellipsis/slide label as expandable */
+   _elm_label_horizontal_size_policy_update(obj, sd);
+   elm_layout_sizing_eval(obj);
+   /* END */
 }
 
 EOLIAN static Elm_Label_Slide_Mode