From e2800b7cb742cbfab4a3a8f721db0bfc54cc802d Mon Sep 17 00:00:00 2001 From: jomui Date: Mon, 24 Apr 2017 16:26:44 +0900 Subject: [PATCH] fixed UC for TV profile Signed-off-by: jomui Change-Id: I30b25de1338e4db706f4c9b85bea6e43992388e8 --- heremaps-uc/src/heremaps-uc.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/heremaps-uc/src/heremaps-uc.c b/heremaps-uc/src/heremaps-uc.c index 6eab4e2..bd9fa00 100644 --- a/heremaps-uc/src/heremaps-uc.c +++ b/heremaps-uc/src/heremaps-uc.c @@ -195,23 +195,15 @@ static Evas_Object *create_popup_tv(Evas_Object *layout, heremaps_uc_app_data *a /* popup */ popup = elm_popup_add(layout); - elm_object_style_set(popup, "default"); eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, back_btn_cb, ad); evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_object_part_text_set(popup, "title,text", P_("IDS_POSITIONING_CONSENT_TITLE")); Evas_Object *box = elm_box_add(popup); elm_box_align_set(box, 0.5, 0); + elm_object_part_content_set(popup, "elm.swallow.content", box); evas_object_show(box); - Evas_Object *scroller = elm_scroller_add(box); - elm_scroller_bounce_set(scroller, EINA_FALSE, EINA_TRUE); - elm_scroller_policy_set(scroller, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO); - 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); - evas_object_size_hint_padding_set(scroller, 5, 5, 0, 0); - evas_object_show(scroller); - char buf[4096] = {0}; char *str1 = P_("IDS_POSITIONING_CONSENT_BODY"); char *str2 = "http://here.com/terms/service-terms"; @@ -219,19 +211,15 @@ static Evas_Object *create_popup_tv(Evas_Object *layout, heremaps_uc_app_data *a snprintf(buf, 4096, str1, str2, str3); char *text = strdup(buf); - Evas_Object* entry = elm_entry_add(scroller); - evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + Evas_Object* entry = elm_entry_add(box); + evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_size_hint_padding_set(entry, 5, 5, 0, 0); elm_entry_editable_set(entry, EINA_FALSE); elm_object_part_text_set(entry, "elm.text", text); - elm_entry_text_style_user_push(entry, "DEFAULT='align=center color=#000000'"); + elm_entry_text_style_user_push(entry, "DEFAULT='align=center'"); + elm_box_pack_end(box, entry); evas_object_show(entry); - elm_object_content_set(scroller, entry); - elm_box_pack_end(box, scroller); - elm_object_part_content_set(popup, "elm.swallow.content", box); - /* Disagree button */ disagree_btn = elm_button_add(popup); elm_object_style_set(disagree_btn, "popup"); -- 2.7.4