Enable dynamic index in home and all apps view.

Changes:
* Fix is based on the minimum and maximum size of the layout.
* This solution must be changed later, when we figure out how to change
the implementation of the main layout and dynamic index.

Change-Id: Ib606fbd3c0f88f6dca1eafa4203f5354a6034e10

diff --git a/res/edje/home.edc b/res/edje/home.edc
index e035114..551c58c 100644 (file)
--- a/res/edje/home.edc
+++ b/res/edje/home.edc
@@ -36,6 +36,12 @@ collections {
                                        state: "default" 0.0;
                                        rel1.relative: 0.0 0.0;
                                        rel2.relative: 1.0 1.0;
+                                       /*
+                                       * This is temporary fix due to strange elm_box bechaviour in the index swallow.
+                                       * Box has dynamic size which affects whole layout.
+                                       */
+                                       min: 1440 2560;
+                                       max: 1440 2560;
                                }
                        }
                        part {
@@ -492,7 +498,6 @@ collections {
                                        rel2.relative: HOME_PG_INDEX_X_MAX HOME_BTNS_Y_MAX;
                                }
                        }
-
                        part {
                                name: PART_NEXT_PAGE_INDICE;
                                type: RECT;

diff --git a/src/all_apps.c b/src/all_apps.c
index 6f4d522..e2ce108 100644 (file)
--- a/src/all_apps.c
+++ b/src/all_apps.c
@@ -110,13 +110,13 @@ HAPI Evas_Object *all_apps_create(Evas_Object *parent, void *data)
                return NULL;
        }
 
-       // s_info.index = dynamic_index_new(s_info.all_apps);
-       // if (!s_info.index) {
-       //      LOGE("[FAILED][dynamic_index_new]");
-       //      page_scroller_destroy(s_info.all_apps);
-       //      s_info.all_apps = NULL;
-       //      return NULL;
-       // }
+       s_info.index = dynamic_index_new(s_info.all_apps);
+       if (!s_info.index) {
+               LOGE("[FAILED][dynamic_index_new]");
+               page_scroller_destroy(s_info.all_apps);
+               s_info.all_apps = NULL;
+               return NULL;
+       }
 
        evas_object_size_hint_min_set(s_info.all_apps, home_screen_get_root_width(), home_screen_get_root_height());
        evas_object_resize(s_info.all_apps, home_screen_get_root_width(), home_screen_get_root_height());
@@ -127,17 +127,17 @@ HAPI Evas_Object *all_apps_create(Evas_Object *parent, void *data)
 
 HAPI void all_apps_show(void)
 {
-       // if (s_info.index) {
-       //      elm_object_part_content_set(s_info.parent, PART_INDEX, s_info.index->box);
-       //      evas_object_show(s_info.index->box);
-       // }
+        if (s_info.index) {
+               elm_object_part_content_set(s_info.parent, PART_INDEX, s_info.index->box);
+               evas_object_show(s_info.index->box);
+       }
 }
 
 HAPI void all_apps_hide(void)
 {
-       // elm_object_part_content_unset(s_info.parent, PART_INDEX);
-       // if (s_info.index)
-       //      evas_object_hide(s_info.index->box);
+       elm_object_part_content_unset(s_info.parent, PART_INDEX);
+       if (s_info.index)
+               evas_object_hide(s_info.index->box);
 }
 
 HAPI void all_apps_del(void)

diff --git a/src/dynamic_index.c b/src/dynamic_index.c
index 30dc48d..37cc2f7 100644 (file)
--- a/src/dynamic_index.c
+++ b/src/dynamic_index.c
@@ -69,10 +69,8 @@ HAPI dynamic_index_t *dynamic_index_new(Evas_Object *page_scroller)
 
        elm_object_signal_callback_add(page_scroller, "scroller,count,changed", "*", __dynamic_index_page_count_changed_cb, dynamic_index);
        evas_object_smart_callback_add(page_scroller, "scroll", __dynamic_index_page_area_changed_cb, dynamic_index);
-
        evas_object_smart_callback_add(page_scroller, "scroll,drag,start", __dynamic_index_current_page_changed_start_cb, dynamic_index);
        evas_object_smart_callback_add(page_scroller, "scroll,anim,stop", __dynamic_index_current_page_changed_stop_cb, dynamic_index);
-
        evas_object_data_set(page_scroller, KEY_INDEX, dynamic_index);
 
        return dynamic_index;
@@ -136,7 +134,6 @@ static Evas_Object *__dynamic_index_create_indice(Evas_Object *box)
        int idx_width = (INDEX_ELEMENT_CONTAINER_WIDTH / ROOT_WIN_W) * home_screen_get_root_width();
        int idx_height = (INDEX_ELEMENT_CONTAINER_HEIGHT / ROOT_WIN_H) * home_screen_get_root_height();
 
-
        if (!box) {
                LOGD("Invalid argument : box is NULL");
                return NULL;
@@ -168,7 +165,6 @@ static Evas_Object *__dynamic_index_create_indice(Evas_Object *box)
 
        evas_object_show(layout);
        elm_box_pack_end(box, layout);
-
        return layout;
 }
 
@@ -214,7 +210,6 @@ static Eina_Bool __dynamic_index_fill_box(dynamic_index_t *dynamic_index)
 
        elm_layout_signal_emit(dynamic_index->indices[c_page], SIGNAL_SET_CURRENT, SIGNAL_SOURCE);
        __dynamic_index_set_properties(dynamic_index->indices[dynamic_index->page_current], 1.0);
-
        return EINA_TRUE;
 }
 
@@ -302,7 +297,6 @@ static Evas_Object *__dynamic_index_box_create(void)
        elm_box_horizontal_set(box, EINA_TRUE);
 
        evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-
        elm_box_align_set(box, 0.5, 0.5);
        evas_object_show(box);
 

diff --git a/src/homescreen-efl.c b/src/homescreen-efl.c
index b922887..89cd777 100644 (file)
--- a/src/homescreen-efl.c
+++ b/src/homescreen-efl.c
@@ -349,12 +349,9 @@ static void __homescreen_efl_create_base_gui(void)
        s_info.layout = elm_layout_add(s_info.win);
        elm_layout_file_set(s_info.layout, edj_path, GROUP_HOME_LY);
        evas_object_size_hint_weight_set(s_info.layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       // evas_object_size_hint_min_set(s_info.layout, 1440, 2560);
-       // evas_object_size_hint_max_set(s_info.layout, 1440, 2560);
        elm_win_resize_object_add(s_info.win, s_info.layout);
        evas_object_show(s_info.layout);
 
-
        home_screen_mvc_set_ly_scale(s_info.layout);
 
        s_info.home = livebox_panel_create(s_info.layout);

diff --git a/src/livebox/livebox_panel.c b/src/livebox/livebox_panel.c
index c569596..cb59dc9 100644 (file)
--- a/src/livebox/livebox_panel.c
+++ b/src/livebox/livebox_panel.c
@@ -190,7 +190,7 @@ void livebox_panel_fill(void)
 
        data_model_iterate_pages(home, __livebox_panel_iterate_page_fill_cb,
                __livebox_panel_iterate_node_fill_cb, &widget_pos_h);
-       // livebox_panel_create_dynamic_index();
+       livebox_panel_create_dynamic_index();
 }
 
 Evas_Object *livebox_panel_create(Evas_Object *parent)
@@ -215,8 +215,8 @@ Evas_Object *livebox_panel_create(Evas_Object *parent)
 
 void livebox_panel_set_content(Evas_Object *layout)
 {
-       // if(s_info.dynamic_index->box)
-       //      elm_layout_content_set(layout, PART_INDEX, s_info.dynamic_index->box);
+       if(s_info.dynamic_index->box)
+               elm_layout_content_set(layout, PART_INDEX, s_info.dynamic_index->box);
 }
 
 void livebox_panel_unset_content(Evas_Object *layout)