From 8554fc7c7f97f5ee05563f137853357efc365588 Mon Sep 17 00:00:00 2001 From: Jehun Lim Date: Tue, 14 Jul 2015 20:11:02 +0900 Subject: [PATCH] modify the width of index button to be flexible Change-Id: I5bc5f3e2524e2cd9be96f69db3a0c6aae7665ba5 Signed-off-by: Jehun Lim --- res/edc/widgets/button.edc | 48 ++++++++++++++++++++++++++++++++++++++-------- src/util/listmgr.c | 5 ++++- 2 files changed, 44 insertions(+), 9 deletions(-) diff --git a/res/edc/widgets/button.edc b/res/edc/widgets/button.edc index ea45e4b..f203cd3 100644 --- a/res/edc/widgets/button.edc +++ b/res/edc/widgets/button.edc @@ -127,7 +127,6 @@ group { group { name: "elm/button/base/base_btn_index"; - inherit: "elm/button/base/base_btn_menu"; data.item: "focus_highlight" "on"; parts { part { @@ -135,9 +134,18 @@ group { scale: 1; description { state: "default" 0.0; - min: 0 36; color: 0 0 0 0; - fixed: 0 1; + } + } + part { + name: "bg_text"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + rel1.to: "elm.text"; + rel2.to: "elm.text"; + color: 0 0 0 0; } description { state: "focused" 0.0; @@ -152,16 +160,20 @@ group { description { state: "default" 0.0; rel1.to: "bg"; - rel2.to: "bg"; + rel2 { + to: "bg"; + relative: 0.0 0.0; + } text { font: FONT_LIGHT; size: 36; - align: 0.0 0.5; + min: 1 0; + align: 0.0 0.7; + ellipsis: -1; } - min: 82 0; - align: 0.0 0.5; - color: COLOR_TEXT_INDEX; + min: 0 36; align: 0.0 0.0; + color: COLOR_TEXT_INDEX; fixed: 1 1; } description { @@ -172,6 +184,26 @@ group { } } } + programs { + program { + name: "focused"; + signal: "elm,action,focus"; + source: "elm"; + action: STATE_SET "focused" 0.0; + target: "bg_text"; + target: "elm.text"; + transition: LINEAR TRANSITION_TIME; + } + program { + name: "unfocused"; + signal: "elm,action,unfocus"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "bg_text"; + target: "elm.text"; + transition: LINEAR TRANSITION_TIME; + } + } } group { diff --git a/src/util/listmgr.c b/src/util/listmgr.c index 42f1a2f..efc3e28 100644 --- a/src/util/listmgr.c +++ b/src/util/listmgr.c @@ -154,6 +154,7 @@ static Evas_Object *_draw_list_item(struct listmgr *lmgr, struct group_info *gi) Evas_Object *ly, *btn, *grid; struct listmgr_data *data; int size; + char buf[128]; data = lmgr->data; @@ -173,7 +174,9 @@ static Evas_Object *_draw_list_item(struct listmgr *lmgr, struct group_info *gi) } elm_object_style_set(btn, STYLE_BTN_INDEX); - elm_object_text_set(btn, gi->name); + + snprintf(buf, sizeof(buf), " %s ", gi->name); + elm_object_text_set(btn, buf); grid = util_add_gengrid(ly, data->grid_item_x, data->grid_item_y); if (!grid) { -- 2.7.4