From: Yunjin Lee <yunjin-.lee@samsung.com>
Date: Thu, 2 Nov 2017 11:44:12 +0000 (+0900)
Subject: Fix UI issue : Set text after setting style
X-Git-Tag: submit/tizen/20171207.095304~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=65f57a72e13803eee62202bb97032d038d2980c0;p=platform%2Fcore%2Fsecurity%2Faskuser.git

Fix UI issue : Set text after setting style

- Set text after setting object's style.
  Otherwise, long text of wearable UI is displayed in 1 line
  and it cuts head and tail of the string hence
  the user could not see whole string.
  Fix it to be displayed in multiline.

Change-Id: I749c04d6e1a7b49ebf4131adb3d39288ee907685
Signed-off-by: Yunjin Lee <yunjin-.lee@samsung.com>
---

diff --git a/src/notification-daemon/ui/PopupCheckMobile.h b/src/notification-daemon/ui/PopupCheckMobile.h
index 3882343..5b24725 100644
--- a/src/notification-daemon/ui/PopupCheckMobile.h
+++ b/src/notification-daemon/ui/PopupCheckMobile.h
@@ -56,9 +56,9 @@ public:
             ALOGE("EFL : Failed to add content");
             throw Exception("Enlightenment failed");
         }
-        elm_object_text_set(m_content, m_msg.c_str());
         elm_object_style_set(m_content, "popup/default");
         elm_label_line_wrap_set(m_content, ELM_WRAP_MIXED);
+        elm_object_text_set(m_content, m_msg.c_str());
         evas_object_size_hint_weight_set(m_content, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
         evas_object_size_hint_align_set(m_content, EVAS_HINT_FILL, EVAS_HINT_FILL);
         elm_object_part_content_set(m_layout, "elm.swallow.content", m_content);
diff --git a/src/notification-daemon/ui/PopupCheckWearable.h b/src/notification-daemon/ui/PopupCheckWearable.h
index a58692c..d59515a 100644
--- a/src/notification-daemon/ui/PopupCheckWearable.h
+++ b/src/notification-daemon/ui/PopupCheckWearable.h
@@ -63,9 +63,9 @@ public:
             ALOGE("EFL : Failed to add content");
             throw Exception("Enlightenment failed");
         }
-        elm_object_text_set(m_content, m_msg.c_str());
         elm_object_style_set(m_content, "popup/default");
         elm_label_line_wrap_set(m_content, ELM_WRAP_MIXED);
+        elm_object_text_set(m_content, m_msg.c_str());
         evas_object_size_hint_weight_set(m_content, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
         evas_object_size_hint_align_set(m_content, EVAS_HINT_FILL, EVAS_HINT_FILL);
         elm_object_part_content_set(m_layoutInner, "label", m_content);