Fix scrollable range according to the UX

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

diff --git a/src/notification-daemon/ui/PopupCheckWearable.h b/src/notification-daemon/ui/PopupCheckWearable.h
index a5746f3..d2f60fb 100644 (file)
--- a/src/notification-daemon/ui/PopupCheckWearable.h
+++ b/src/notification-daemon/ui/PopupCheckWearable.h
@@ -58,6 +58,13 @@ public:
     }
     virtual void create() {
         elm_object_style_set(m_popup, "circle");
+        elm_popup_scrollable_set(m_popup, EINA_FALSE);
+
+        m_scroller = elm_scroller_add(m_popup);
+        elm_scroller_policy_set(m_scroller, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
+        evas_object_size_hint_weight_set(m_scroller, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+        evas_object_size_hint_align_set(m_scroller, EVAS_HINT_FILL, EVAS_HINT_FILL);
+        elm_object_content_set(m_popup, m_scroller);
 
         m_layout = elm_layout_add(m_popup);
         if (m_layout == nullptr) {
@@ -66,22 +73,16 @@ public:
         }
         elm_layout_theme_set(m_layout, "layout", "popup", "content/circle/buttons2");
         elm_object_part_text_set(m_layout, "elm.text.title", Po::getPopupTitleMsg().c_str());
-        elm_object_content_set(m_popup, m_layout);
-
-        m_scroller = elm_scroller_add(m_layout);
-        elm_scroller_policy_set(m_scroller, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
-        evas_object_size_hint_weight_set(m_scroller, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-        evas_object_size_hint_align_set(m_scroller, EVAS_HINT_FILL, EVAS_HINT_FILL);
-        elm_object_part_content_set(m_layout, "elm.swallow.content", m_scroller);
+        elm_object_content_set(m_scroller, m_layout);
 
-        m_layoutInner = elm_layout_add(m_scroller);
+        m_layoutInner = elm_layout_add(m_layout);
         if (m_layoutInner == nullptr) {
             ALOGE("EFL : Failed to add layout");
             throw Exception("Enlightenment failed");
         }
         elm_layout_file_set(m_layoutInner, RES_DIR"/popup_custom.edj", "popup_checkview_internal");
         evas_object_size_hint_weight_set(m_layoutInner, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-        elm_object_content_set(m_scroller, m_layoutInner);
+        elm_object_part_content_set(m_layout, "elm.swallow.content", m_layoutInner);
 
         eext_rotary_object_event_callback_add(m_scroller, rotaryChangedCb, m_scroller);
         eext_rotary_object_event_activated_set(m_scroller, EINA_TRUE);