From 8f06058919bdae2ffd978e9349203e65f7141df0 Mon Sep 17 00:00:00 2001 From: YoungHun Cho Date: Wed, 15 Jun 2016 15:11:58 +0900 Subject: [PATCH] Fix Widget duplication issue and duplicated popup folder view issue Change-Id: I801e730c56c6983179044a63977aeffdcdcbc11e --- src/apps_view.c | 2 +- src/cluster_view.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/apps_view.c b/src/apps_view.c index 636cfcc..fbe7c33 100755 --- a/src/apps_view.c +++ b/src/apps_view.c @@ -889,7 +889,7 @@ static void __apps_view_icon_check_changed_cb(void *data, Evas_Object *obj, cons void apps_view_hw_menu_key(void) { - if (apps_view_s.view_state == VIEW_STATE_NORMAL) + if (apps_view_s.view_state == VIEW_STATE_NORMAL && apps_view_s.opened_folder == NULL) menu_change_state_on_hw_menu_key(apps_menu_table); } diff --git a/src/cluster_view.c b/src/cluster_view.c index 8296d3b..7a9bfe0 100755 --- a/src/cluster_view.c +++ b/src/cluster_view.c @@ -1305,8 +1305,10 @@ static void __cluster_view_edit_drop_widget(void *data) cluster_view_s.animation_from_x = cluster_mouse_info.move_x - cluster_mouse_info.offset_x; cluster_view_s.animation_from_y = cluster_mouse_info.move_y - cluster_mouse_info.offset_y; - cluster_page_t *page = (cluster_page_t *)eina_list_nth(cluster_view_s.page_list, cluster_view_s.current_page); + cluster_page_t *page = (cluster_page_t *)eina_list_nth(cluster_view_s.page_list, cluster_view_s.picked_widget->page_idx); cluster_page_unset(page, cluster_view_s.picked_widget); + + page = (cluster_page_t *)eina_list_nth(cluster_view_s.page_list, cluster_view_s.current_page); cluster_page_get_highlight_xy(page, &to_x, &to_y); if (to_x == INIT_VALUE || to_y == INIT_VALUE) { cluster_page_check_empty_space_pos(page, cluster_view_s.picked_widget, &to_x, &to_y); -- 2.7.4