remove grid,show signal for smooth transition

Change-Id: I20150a3ac0ea312d7ddb21b220a8d52275b7153a

diff --git a/res/edje/page.edc b/res/edje/page.edc
index 53b9781f5031ae1e3b3b6826b021763e088cb8a9..fcfa7c7273d2fbf24d9f32007ee62883ddeafbc6 100644 (file)
--- a/res/edje/page.edc
+++ b/res/edje/page.edc
@@ -31,19 +31,6 @@ collections {
                                        visible: 1;
                                }
                        }
-                       part { name: "grid_base";
-                               type: RECT;
-                               scale: 1;
-                               mouse_events: 0;
-                               description { state: "default" 0.0;
-                                       rel1 { relative: 0.0 0.0; to: "bg"; }
-                                       rel2 { relative: 1.0 0.0; to: "bg"; }
-                                       min: 0 12;
-                                       max: -1 12;
-                                       align: 0 1;
-                                       color: 0 0 0 0;
-                               }
-                       }
                        part {
                                name: "content";
                                type: SWALLOW;
@@ -60,21 +47,9 @@ collections {
                                        inherit: "default" 0.0;
                                        visible: 0;
                                }
-                               description {
-                                       state: "grid" 0.0;
-                                       inherit: "default" 0.0;
-                                       rel1 { relative: 0.0 0.0; to: "grid_base"; }
-                               }
                        }
                }
                programs {
-                       program {
-                               name: "grid_show";
-                               signal: "grid,show";
-                               source: "*";
-                               action: STATE_SET "grid" 0.0;
-                               target: "content";
-                       }
                        program {
                                name: "show";
                                signal: "show";

diff --git a/src/scroller.c b/src/scroller.c
index 93712c2013aaf1db52241044c670a0ace8437e68..06f6ed2668869af269df5cf99c4e4f744bbcdb0a 100644 (file)
--- a/src/scroller.c
+++ b/src/scroller.c
@@ -336,11 +336,7 @@ void _scroller_show_page(Evas_Object *scroller, Evas_Object *page, attach_panel_
                index = 0;
        }
 
-       if (page == attach_panel->grid_page) {
-               elm_layout_signal_emit(page, "grid,show", "");
-       } else {
-               elm_layout_signal_emit(page, "show", "");
-       }
+       elm_layout_signal_emit(page, "show", "");
 
        if (attach_panel->cur_page_no != index) {
                _content_list_send_message_to_content(attach_panel->content_list, "__ATTACH_PANEL_SHOW_CONTENT_CATEGORY__", "false", attach_panel->cur_page_no);

diff --git a/src/ui_manager.c b/src/ui_manager.c
index f99454adbec4b2d455ddb5a08a7271c3281d5ae8..a5269691fc9021597da71401695aa83c3a237a7f 100644 (file)
--- a/src/ui_manager.c
+++ b/src/ui_manager.c
@@ -81,11 +81,7 @@ Evas_Object *_ui_manager_create_content(Evas_Object *page, content_s *content_in
        evas_object_size_hint_weight_set(content, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        elm_object_part_content_set(page, "content", content);
 
-       if (content == attach_panel->grid) {
-               elm_layout_signal_emit(page, "grid,show", "");
-       } else {
-               elm_layout_signal_emit(page, "show", "");
-       }
+       elm_layout_signal_emit(page, "show", "");
 
        evas_object_data_set(content, DATA_KEY_PAGE, page);