From: Hyojung Jo Date: Tue, 7 Jul 2015 07:30:31 +0000 (+0900) Subject: Fixed the menu width to be flexible depending on the text length X-Git-Tag: submit/tizen/20150728.063352~14 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b7ef93a57c1e35e8cec0c93ccbf042fe75292bc1;p=profile%2Ftv%2Fapps%2Fnative%2Fair_apps.git Fixed the menu width to be flexible depending on the text length Change-Id: I615503c94eb46dc68742af3ee930ef83d32a4aa9 Signed-off-by: Hyojung Jo --- diff --git a/include/define.h b/include/define.h index e400d02..19b1abb 100644 --- a/include/define.h +++ b/include/define.h @@ -61,8 +61,10 @@ #define MENU_COUNT 2 /* Size */ -#define SIZE_GRID_WIDTH (212+26) -#define SIZE_GRID_HEIGHT (294+26) +#define SIZE_GRID_WIDTH (212 + 26) +#define SIZE_GRID_HEIGHT (294 + 26) #define SIZE_STR 1024 +#define SIZE_BOX_PAD_H (40 + 40) +#define SIZE_BOX_PAD_V 0 #endif /* __AIR_APPS_DEFINE_H__ */ diff --git a/include/utils.h b/include/utils.h index bc92948..c39e4b4 100644 --- a/include/utils.h +++ b/include/utils.h @@ -20,7 +20,8 @@ Evas_Object *add_window(const char *name); Evas_Object *add_layout(Evas_Object *parent, const char *group); Evas_Object *add_box(Evas_Object *parent, const char *part, - Eina_Bool horizontal); + Eina_Bool horizontal, Evas_Coord padding_h, + Evas_Coord padding_v); Evas_Object *add_button(Evas_Object *parent, const char *part, const char *text, const char *style); diff --git a/res/widget/button.edc b/res/widget/button.edc index 762c828..161b0ef 100644 --- a/res/widget/button.edc +++ b/res/widget/button.edc @@ -30,7 +30,7 @@ group { scale, 1; description { state, "default" 0.0; - min, 240 82; + min, 0 82; } description { state, "selected" 0.0; @@ -44,53 +44,90 @@ group { } part { - name, "elm.text"; - type, TEXT; + name, "bg.left"; + type, RECT; scale, 1; description { state, "default" 0.0; - color, 104 104 104 255; - min, 0 82; - align, 0.5 0.0; - fixed, 0 1; - text { - font, FONT_TIZENSANS_LIGHT; - size, 32; - align, 0.5 0.5; + min, 40 82; + rel1.to, "bg"; + rel2 { + relative, 0.0 0.0; + to, "bg"; } + align, 1.0 0.0; + fixed, 1 1; } description { state, "selected" 0.0; inherit, "default" 0.0; - color, 64 136 211 255; - text.font, FONT_TIZENSANS_REGULAR; } description { state, "focused" 0.0; inherit, "default" 0.0; - color, 255 255 255 255; - text.font, FONT_TIZENSANS_REGULAR; + color, 0 119 246 255; } } part { - name, "padding.bottom.line"; - type, SPACER; + name, "bg.right"; + type, RECT; scale, 1; description { state, "default" 0.0; - min, 28 3; + min, 40 82; rel1 { + relative, 1.0 0.0; to, "bg"; - relative, 0.0 1.0; } rel2 { + relative, 1.0 0.0; to, "bg"; - relative, 0.0 1.0; } - align, 0.0 1.0; + align, 0.0 0.0; fixed, 1 1; } + description { + state, "selected" 0.0; + inherit, "default" 0.0; + } + description { + state, "focused" 0.0; + inherit, "default" 0.0; + color, 0 119 246 255; + } + } + + part { + name, "elm.text"; + type, TEXT; + scale, 1; + description { + state, "default" 0.0; + color, 104 104 104 255; + min, 0 82; + align, 0.5 0.0; + fixed, 0 1; + text { + min, 1 1; + font, FONT_TIZENSANS_LIGHT; + size, 32; + align, 0.5 0.5; + ellipsis, -1; + } + } + description { + state, "selected" 0.0; + inherit, "default" 0.0; + color, 64 136 211 255; + text.font, FONT_TIZENSANS_REGULAR; + } + description { + state, "focused" 0.0; + inherit, "default" 0.0; + color, 255 255 255 255; + text.font, FONT_TIZENSANS_REGULAR; + } } part { @@ -100,17 +137,16 @@ group { description { state, "default" 0.0; color, 64 136 211 255; - min, 184 3; + min, 0 3; rel1 { - to, "padding.bottom.line"; - relative, 1.0 0.0; + to, "bg"; + relative, 0.0 1.0; } rel2 { - to, "padding.bottom.line"; - relative, 1.0 0.0; + to, "bg"; } - align, 0.0 0.0; - fixed, 1 1; + align, 0.5 1.0; + fixed, 0 1; visible, 0; } description { @@ -145,6 +181,8 @@ group { state = get_int(cur_state); if (state == STATE_SELECTED) { set_state(PART:"bg", "selected", 0.0); + set_state(PART:"bg.left", "selected", 0.0); + set_state(PART:"bg.right", "selected", 0.0); set_state(PART:"elm.text", "selected", 0.0); set_state(PART:"bottom.line", "selected", 0.0); } else { @@ -157,6 +195,8 @@ group { name, "focused,anim"; action, STATE_SET "focused" 0.0; target, "bg"; + target, "bg.left"; + target, "bg.right"; target, "elm.text"; target, "bottom.line"; transition, LINEAR 0.17; @@ -166,6 +206,8 @@ group { name, "unfocused,anim"; action, STATE_SET "default" 0.0; target, "bg"; + target, "bg.left"; + target, "bg.right"; target, "elm.text"; target, "bottom.line"; transition, LINEAR 0.17; @@ -178,6 +220,8 @@ group { script { set_int(cur_state, STATE_SELECTED); set_state(PART:"bg", "selected", 0.0); + set_state(PART:"bg.left", "selected", 0.0); + set_state(PART:"bg.right", "selected", 0.0); set_state(PART:"elm.text", "selected", 0.0); set_state(PART:"bottom.line", "selected", 0.0); } diff --git a/src/grid/grid_myapps.c b/src/grid/grid_myapps.c index 252dfbc..53fe74c 100644 --- a/src/grid/grid_myapps.c +++ b/src/grid/grid_myapps.c @@ -31,7 +31,7 @@ static char *_text_get(void *data, Evas_Object *obj, const char *part) } adata = data; - return get_app_name(adata); + return strdup(get_app_name(adata)); } static Evas_Object *_content_get(void *data, Evas_Object *obj, const char *part) diff --git a/src/utils.c b/src/utils.c index 8cb0e1d..257e210 100644 --- a/src/utils.c +++ b/src/utils.c @@ -67,7 +67,8 @@ Evas_Object *add_layout(Evas_Object *parent, const char *group) } Evas_Object *add_box(Evas_Object *parent, const char *part, - Eina_Bool horizontal) + Eina_Bool horizontal, Evas_Coord padding_h, + Evas_Coord padding_v) { Evas_Object *box; @@ -83,6 +84,7 @@ Evas_Object *add_box(Evas_Object *parent, const char *part, } elm_box_horizontal_set(box, horizontal); + elm_box_padding_set(box, padding_h, padding_v); evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); diff --git a/src/view/view_base.c b/src/view/view_base.c index a9d1595..b334102 100644 --- a/src/view/view_base.c +++ b/src/view/view_base.c @@ -268,7 +268,8 @@ static bool _draw_top_area(struct _priv *priv) elm_object_part_text_set(priv->base, PART_TOP_TITLE, STR_APPS); - box = add_box(priv->base, PART_MENU, EINA_TRUE); + box = add_box(priv->base, PART_MENU, EINA_TRUE, + SIZE_BOX_PAD_H, SIZE_BOX_PAD_V); if (!box) { _ERR("Add box failed."); return false;