Block scroll on one page 42/86642/1
authorjunkyu han <junkyu.han@samsung.com>
Fri, 2 Sep 2016 06:16:45 +0000 (15:16 +0900)
committerjunkyu han <junkyu.han@samsung.com>
Fri, 2 Sep 2016 06:16:45 +0000 (15:16 +0900)
Change-Id: Iab9487c5db9e86c68a3b29d6c588e05391e8fc25

src/apps_view.c
src/cluster_view.c

index b58d625..b5cd44c 100755 (executable)
@@ -1668,12 +1668,12 @@ static void __apps_view_edit_drag_icon(void *data)
                                apps_view_update_folder_icon(opened_folder);
                        }
                }
-       } else if (apps_mouse_info.move_x > APPS_VIEW_EDIT_RIGHT_SCROLL_REGION) {
+       } else if ((apps_mouse_info.move_x > APPS_VIEW_EDIT_RIGHT_SCROLL_REGION) && (apps_view_s.page_count > 1)) {
                LOGD("Move to next page");
                if (!apps_view_s.edit_mode_scroll_timer)
                        apps_view_s.edit_mode_scroll_timer = ecore_timer_add(HOME_EDIT_SCROLL_MOVE_TIME, __apps_view_scroll_timer_cb, NULL);
 
-       } else if (apps_mouse_info.move_x < APPS_VIEW_EDIT_LEFT_SCROLL_REGION) {
+       } else if ((apps_mouse_info.move_x < APPS_VIEW_EDIT_LEFT_SCROLL_REGION) && (apps_view_s.page_count > 1)) {
                LOGD("Move to prev page");
                if (!apps_view_s.edit_mode_scroll_timer)
                        apps_view_s.edit_mode_scroll_timer = ecore_timer_add(HOME_EDIT_SCROLL_MOVE_TIME, __apps_view_scroll_timer_cb, NULL);
index e4b0b9a..8289458 100755 (executable)
@@ -1308,12 +1308,12 @@ static void __cluster_view_edit_drag_widget(void *data)
        edje_object_part_geometry_get(elm_layout_edje_get(page->page_layout), CLUSTER_BG, &bg_x, &bg_y, &bg_w, &bg_h);
        evas_object_geometry_get(widget_layout, &widget_x, &widget_y, NULL, NULL);
 
-       if (cluster_mouse_info.move_x > CLUSTER_EDIT_RIGHT_SCROLL_REGION) {
+       if ((cluster_mouse_info.move_x > CLUSTER_EDIT_RIGHT_SCROLL_REGION) && (cluster_view_s.page_count > 1)) {
                LOGD("Move to next page");
                if (!cluster_view_s.edit_mode_scroll_timer)
                        cluster_view_s.edit_mode_scroll_timer = ecore_timer_add(HOME_EDIT_SCROLL_MOVE_TIME, __cluster_view_scroll_timer_cb, NULL);
 
-       } else if (cluster_mouse_info.move_x < CLUSTER_EDIT_LEFT_SCROLL_REGION) {
+       } else if ((cluster_mouse_info.move_x < CLUSTER_EDIT_LEFT_SCROLL_REGION) && (cluster_view_s.page_count > 1)) {
                LOGD("Move to prev page");
                if (!cluster_view_s.edit_mode_scroll_timer)
                        cluster_view_s.edit_mode_scroll_timer = ecore_timer_add(HOME_EDIT_SCROLL_MOVE_TIME, __cluster_view_scroll_timer_cb, NULL);