prevent scroller loop for single page

Change-Id: I58a10ade01124164c42796b9a7afd6e4e11a8121
Signed-off-by: YoungHun Cho <hoon.cho@samsung.com>

diff --git a/.rds_delta b/.rds_delta
index 6201ce4..a8acc85 100644 (file)
--- a/.rds_delta
+++ b/.rds_delta
@@ -3,4 +3,4 @@
 #modify
 author-signature.xml
 signature1.xml
-res/edje/add_widget_viewer.edj
+bin/homescreen-efl

diff --git a/src/apps_view.c b/src/apps_view.c
index edb5769..6282c0f 100755 (executable)
--- a/src/apps_view.c
+++ b/src/apps_view.c
@@ -635,7 +635,7 @@ static void __apps_view_create_base_gui(Evas_Object *win)
                return;
        }
        elm_scroller_content_min_limit(apps_view_s.scroller, EINA_FALSE, EINA_FALSE);
-       elm_scroller_bounce_set(apps_view_s.scroller, EINA_FALSE, EINA_TRUE);
+       elm_scroller_bounce_set(apps_view_s.scroller, EINA_FALSE, EINA_FALSE);
        elm_scroller_policy_set(apps_view_s.scroller, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
        elm_scroller_page_scroll_limit_set(apps_view_s.scroller, 1, 1);
        evas_object_size_hint_weight_set(apps_view_s.scroller, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -711,6 +711,9 @@ static Evas_Object *__apps_view_add_page(void)
        apps_view_s.page_list = eina_list_append(apps_view_s.page_list, page_ly);
        apps_view_s.page_count += 1;
        page_indicator_set_page_count(apps_view_s.indicator, apps_view_s.page_count);
+
+       elm_scroller_loop_set(apps_view_s.scroller, apps_view_s.page_count > 1, EINA_FALSE);
+
        return page_ly;
 }
 
@@ -741,6 +744,8 @@ static void __apps_view_remove_page(void)
        page_indicator_set_page_count(apps_view_s.indicator, apps_view_s.page_count);
 #endif
        evas_object_del(item);
+
+       elm_scroller_loop_set(apps_view_s.scroller, apps_view_s.page_count > 1, EINA_FALSE);
 }
 
 static void __apps_view_fill_apps(void *data, Ecore_Thread *th)

diff --git a/src/cluster_view.c b/src/cluster_view.c
index fc1e322..4a7b052 100755 (executable)
--- a/src/cluster_view.c
+++ b/src/cluster_view.c
@@ -225,7 +225,7 @@ Evas_Object *__cluster_view_create_base_gui(Evas_Object *win)
                return NULL;
        }
        elm_scroller_content_min_limit(cluster_view_s.scroller, EINA_FALSE, EINA_FALSE);
-       elm_scroller_bounce_set(cluster_view_s.scroller, EINA_FALSE, EINA_TRUE);
+       elm_scroller_bounce_set(cluster_view_s.scroller, EINA_FALSE, EINA_FALSE);
        elm_scroller_policy_set(cluster_view_s.scroller, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
        elm_scroller_page_scroll_limit_set(cluster_view_s.scroller, 1, 0);
        evas_object_size_hint_weight_set(cluster_view_s.scroller, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -931,6 +931,8 @@ static cluster_page_t *__cluster_view_page_new(void)
 
        page_indicator_set_page_count(cluster_view_s.indicator, cluster_view_s.page_count);
 
+       elm_scroller_loop_set(cluster_view_s.scroller, cluster_view_s.page_count > 1, EINA_FALSE);
+
        return page_t;
 }
 
@@ -952,6 +954,8 @@ static void __cluster_view_page_delete(cluster_page_t *page)
 
        cluster_data_set_page_count(cluster_view_s.page_count);
        page_indicator_set_page_count(cluster_view_s.indicator, cluster_view_s.page_count);
+
+       elm_scroller_loop_set(cluster_view_s.scroller, cluster_view_s.page_count > 1, EINA_FALSE);
 }
 
 static void __cluster_view_allpage_delete_clicked(void *data, Evas_Object *obj, const char *emission, const char *source)