add Backlight time view in setting-display 77/47577/1 accepted/tizen/mobile/20150905.080701 submit/tizen/20150905.061555
authorMyoungJune Park <mj2004.park@samsung.com>
Sat, 5 Sep 2015 06:14:15 +0000 (15:14 +0900)
committerMyoungJune Park <mj2004.park@samsung.com>
Sat, 5 Sep 2015 06:14:15 +0000 (15:14 +0900)
it was invisible because of not supporting old genlist style.

Change-Id: I0a99a420c13394b8c71f70267a1cd812285131cf

setting-common/src/setting-common-draw-popup.c
setting-display/src/setting-display-main.c

index bd70efdfc4c56764cbd48d1edb750a3535151cf9..c7caa4e19be5bfbe08ba35693736ae037ad46de2 100755 (executable)
@@ -1165,24 +1165,35 @@ Evas_Object *setting_create_popup_with_list(Evas_Object **genlist, void *data, E
        SETTING_TRACE_BEGIN;
        retv_if(NULL == parent, NULL);
        Evas_Object *popup = elm_popup_add(parent);
-       elm_popup_align_set(popup, ELM_NOTIFY_ALIGN_FILL, 1.0);
+       elm_popup_align_set(popup, ELM_NOTIFY_ALIGN_FILL, 0.5);
        evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        elm_object_part_text_set(popup, "title,text", _(title));
        ADD_POPUP_MULTI_LANGUAGE_AUTO_UPDATE(popup, title, NULL, NULL, NULL, NULL);
 
        evas_object_show(popup);
 
+       // create box
+       Evas_Object *box;
+        box = elm_box_add(popup);
+    evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+
+
        /* genlist */
-       Evas_Object *scroller = elm_genlist_add(popup);
-       elm_genlist_mode_set(scroller, ELM_LIST_COMPRESS);/*essential to auto compute the height of genlist */
+       Evas_Object *scroller = elm_genlist_add(box);
+       //elm_genlist_mode_set(scroller, ELM_LIST_COMPRESS);/*essential to auto compute the height of genlist */
+
        evas_object_size_hint_weight_set(scroller, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_size_hint_align_set(scroller, EVAS_HINT_FILL, EVAS_HINT_FILL);
-       elm_scroller_content_min_limit(scroller, EINA_FALSE, EINA_TRUE);/*essential to auto compute the height of genlist */
+       //elm_scroller_content_min_limit(scroller, EINA_FALSE, EINA_TRUE);/*essential to auto compute the height of genlist */
        evas_object_show(scroller);
 
-       if (genlist) *genlist = scroller;
+       //if (genlist) *genlist = scroller;
+       *genlist = scroller;
+
+       elm_box_pack_end(box, scroller);
+    evas_object_size_hint_min_set(box, -1, 192*7);
+    elm_object_content_set(popup, box);
 
-       elm_object_content_set(popup, scroller);
        setting_add_hardkey_features(popup, data);
        eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, eext_popup_back_cb_2, data);
        return popup;
index 7bbf3be40ed0aec9df191a9e185f75e0521d306c..00d5c55117306ada18bacfbe559d83d82d03e678 100755 (executable)
@@ -529,7 +529,7 @@ static int setting_display_main_create(void *cb)
        char *pa_backlight_time = get_pa_backlight_time_str();
        ad->data_back =
            setting_create_Gendial_field_def(scroller,
-                                            &itc_2text_3_parent,
+                                                                                &itc_1text_parent,
                                             setting_display_main_mouse_up_Gendial_list_cb, ad,
                                             SWALLOW_Type_INVALID, NULL, NULL,
                                             0, KeyStr_BacklightTime,