Fix a problem of font preview 76/72476/1 accepted/tizen/common/20160602.140146 submit/tizen/20160602.021238
authorHyunjee Kim <hj0426.kim@samsung.com>
Wed, 1 Jun 2016 07:09:59 +0000 (16:09 +0900)
committerHyunjee Kim <hj0426.kim@samsung.com>
Wed, 1 Jun 2016 07:10:22 +0000 (16:10 +0900)
- make font preview updated when font size change

Change-Id: I39517d31f9e87850887f0823c039feeed930b786
Signed-off-by: Hyunjee Kim <hj0426.kim@samsung.com>
setting-font/src/setting-font-main.c

index 6999926d2f56dbc6fd5655d5980e204bf068bdc0..4c41d596d99c82b242eaef5c07520107658b601e 100644 (file)
@@ -213,24 +213,25 @@ static Evas_Object *_font_size_slider_get(void *data, Evas_Object *obj,
 
                        elm_object_part_content_set(layout, "slider", li_slider);
                        return layout;
-               } else {
-                       SETTING_TRACE("item_data->keyStr:%s", item_data->keyStr);
-                       SETTING_TRACE("item_data->sub_desc:%s", item_data->sub_desc);
-                       int padding_h = 0;
-                       Evas_Object *box = elm_box_add(obj);
-                       evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-                       evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
-                       elm_box_padding_set(box, 10, padding_h);
-
-                       elm_box_pack_end(box, setting_create_blank_rect_customize(obj, 1, 20));
-
-                       item_data->eo_check = setting_create_textbox(obj, item_data->sub_desc);
-                       elm_box_pack_end(box, item_data->eo_check);
-                       elm_box_pack_end(box, setting_create_blank_rect_customize(obj, 1, 20));
-
-                       return box;
                }
+       } else if (!safeStrCmp(part, "elm.text")) {
+               SETTING_TRACE("item_data->keyStr:%s", item_data->keyStr);
+               SETTING_TRACE("item_data->sub_desc:%s", item_data->sub_desc);
+               int padding_h = 0;
+               Evas_Object *box = elm_box_add(obj);
+               evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+               evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
+               elm_box_padding_set(box, 10, padding_h);
+
+               elm_box_pack_end(box, setting_create_blank_rect_customize(obj, 1, 20));
+
+               item_data->eo_check = setting_create_textbox(obj, item_data->sub_desc);
+               elm_box_pack_end(box, item_data->eo_check);
+               elm_box_pack_end(box, setting_create_blank_rect_customize(obj, 1, 20));
+
+               return box;
        }
+
        return NULL;
 }
 
@@ -431,6 +432,9 @@ static Eina_Bool __slide_timer(void *data)
                ad->font_example->sub_desc = get_example_style_text(ad->font_size_str, ad->font_type_str);
                G_FREE(tmp);
                elm_entry_entry_set(ad->font_example->eo_check, ad->font_example->sub_desc);
+
+               elm_genlist_item_fields_update(ad->font_example->item, "elm.text", ELM_GENLIST_ITEM_FIELD_ALL);
+
        }
 
        /* finalize */
@@ -837,10 +841,12 @@ static int setting_font_main_create(void *cb)
        ad->itc_1text_1icon_2.func.text_get = _item_text_keystr2_get;
 
        setting_create_Gendial_itc(SETTING_GENLIST_LEFT_ICON_CONTENT_ICON_STYLE, &(ad->itc_bg_1icon));
-       setting_create_Gendial_itc(SETTING_GENLIST_ICON_1LINE_STYLE, &(ad->itc_1icon));
        SETTING_TRACE("ad->itc_bg_1icon: %s ", ad->itc_bg_1icon);
        ad->itc_bg_1icon.func.content_get = _font_size_slider_get;
 
+       setting_create_Gendial_itc(SETTING_GENLIST_ICON_1LINE_STYLE, &(ad->itc_1icon));
+       ad->itc_1icon.func.content_get = _font_size_slider_get;
+
        retvm_if(ad->win_main_layout == NULL, SETTING_DRAW_ERR_FAIL_LOAD_EDJ,
                         "win_main_layout is NULL");
        ad->font_change_status = SELECTED_FONT_CHANGE_NONE;