From b7e08ae21b17524f1fe2eeda9c711db7af99e084 Mon Sep 17 00:00:00 2001 From: Seonah Moon Date: Mon, 18 Jul 2016 14:26:23 +0900 Subject: [PATCH] Change progressbar percent label to textblock Change-Id: Ibc296cf5e2bfc1932d6b1d233fb51c7e45503aa1 Signed-off-by: Seonah Moon --- sources/wearable/res/wearable-circle/edje/wifi.edc | 28 ++++++++++---------- .../src/wearable-circle/view/layout_wps_progress.c | 30 ++-------------------- 2 files changed, 15 insertions(+), 43 deletions(-) diff --git a/sources/wearable/res/wearable-circle/edje/wifi.edc b/sources/wearable/res/wearable-circle/edje/wifi.edc index 72538eb..4064275 100755 --- a/sources/wearable/res/wearable-circle/edje/wifi.edc +++ b/sources/wearable/res/wearable-circle/edje/wifi.edc @@ -55,7 +55,9 @@ collections { style { name: "progressbar_layout_style"; base: "font=Tizen:style=Regular font_size=32 color=#F9F9F9FF align=center ellipsis=1.0 text_class=label"; } - + style { name: "wps_progress_popup_layout"; + base: "font=Tizen:style=Regular font_size=32 color=#F9F9F9FF align=center ellipsis=1.0 text_class=label"; + } } group { name: "ap_signal_image_layout"; @@ -317,23 +319,19 @@ collections { } } part { - name: "elm.swallow.percent_label"; - type: SWALLOW; + name: "elm.swallow.percent_text"; + type: TEXTBLOCK; scale: 1; description { state: "default" 0.0; - min: 0 32; - fixed: 0 1; - align: 0.5 0.0; - rel1 { - relative: 1.0 0.2; - to_x: "top_left_padding"; - to_y: "top_padding"; - } - rel2 { - relative: 0.0 1.0; - to_x: "top_right_padding"; - to_y: "top_padding"; + fixed: 1 1; + rel1.to: "base"; + rel2.to: "elm.image"; + rel1.relative: 0.5 0.0; + rel2.relative: 0.5 1.0; + text { + style: "wps_progress_popup_layout"; + min: 1 1; } } } diff --git a/sources/wearable/src/wearable-circle/view/layout_wps_progress.c b/sources/wearable/src/wearable-circle/view/layout_wps_progress.c index 4c83de0..73907c8 100755 --- a/sources/wearable/src/wearable-circle/view/layout_wps_progress.c +++ b/sources/wearable/src/wearable-circle/view/layout_wps_progress.c @@ -39,7 +39,6 @@ struct _layout_wps_progress_object { Evas_Object *progressbar; Evas_Object *progress_label; Evas_Object *progress_label_circle; - Evas_Object *progress_percent_label; Evas_Object *cancel_button; Ecore_Timer *progress_timer; @@ -88,7 +87,7 @@ static Eina_Bool __progress_timer_task_cb(void *data) eext_circle_object_value_set(wps_progress->progressbar, progressbar_value); g_snprintf(percent_text, sizeof(percent_text), "%d%%", (gint)progressbar_value); - elm_object_text_set(wps_progress->progress_percent_label, percent_text); + elm_object_part_text_set(wps_progress->progress_popup_layout, "elm.swallow.percent_text", percent_text); WIFI_LOG_INFO("progress[%0.2f]", progressbar_value); if (progressbar_value < 100) @@ -194,23 +193,6 @@ static Evas_Object *_create_progressbar(layout_wps_progress_object *self, Evas_O return progressbar; } -static Evas_Object *_create_progress_percent_label(layout_wps_progress_object *self, Evas_Object *parent) -{ - Evas_Object *percent_label; - WIFI_RET_VAL_IF_FAIL(self != NULL, NULL); - WIFI_RET_VAL_IF_FAIL(parent != NULL, NULL); - - percent_label = elm_label_add(parent); - WIFI_RET_VAL_IF_FAIL(percent_label != NULL, NULL); - - elm_object_style_set(percent_label, "popup/default"); - elm_label_line_wrap_set(percent_label, ELM_WRAP_MIXED); - elm_object_text_set(percent_label, "0%"); - evas_object_show(percent_label); - - return percent_label; -} - static Evas_Object *_create_cancel_button(layout_wps_progress_object *self, Evas_Object *parent) { Evas_Object *cancel_button; @@ -306,15 +288,7 @@ gboolean layout_wps_progress_create(layout_wps_progress_object *self) elm_object_part_content_set(self->progress_popup_layout, "elm.swallow.label", self->progress_label); - self->progress_percent_label = - _create_progress_percent_label(self, self->progress_popup_layout); - if (!self->progress_percent_label) { - WIFI_LOG_ERR("_create_progress_percent_label() is failed."); - layout_wps_progress_destroy(self); - return FALSE; - } - elm_object_part_content_set(self->progress_popup_layout, - "elm.swallow.percent_label", self->progress_percent_label); + elm_object_part_text_set(self->progress_popup_layout, "elm.swallow.percent_text", "0%"); self->cancel_button = _create_cancel_button(self, self->bottom_button_layout); if (!self->cancel_button) { -- 2.7.4