From a0bbe6de43f2d8ec175bed1e500d656199c4ddf7 Mon Sep 17 00:00:00 2001 From: Radek Kintop Date: Wed, 2 Mar 2016 14:53:19 +0100 Subject: [PATCH] Action menu icon-button style Change-Id: I5357b94906ddc5d15edbfa1c6e204293dd462d81 Signed-off-by: Radek Kintop --- include/define.h | 5 +++ res/images/btn_act_menu_circle_bg.png | Bin 0 -> 5074 bytes res/view/action_menu.edc | 57 ++++++++++++++++++++++++++++++++++ res/widget/button.edc | 57 ++++++++++++++++++++++++++++++++++ src/view/view_action_menu.c | 15 +++++++++ 5 files changed, 134 insertions(+) create mode 100644 res/images/btn_act_menu_circle_bg.png diff --git a/include/define.h b/include/define.h index 6449355..16e5373 100644 --- a/include/define.h +++ b/include/define.h @@ -115,6 +115,11 @@ #define PART_POPUP_BUTTON5 "part.popup.btn5" #define PART_POPUP_BUTTON_X "part.popup.btn%d" +#define PART_ACT_MENU_ICO_BTN0 PART_POPUP_BUTTON0 +#define PART_ACT_MENU_ICO_BTN1 PART_POPUP_BUTTON1 +#define PART_ACT_MENU_ICO_BTN2 PART_POPUP_BUTTON2 +#define PART_ACT_MENU_ICO_BTN3 PART_POPUP_BUTTON3 + #define PART_POPUP_NAME "part.popup.name" #define PART_POPUP_BOTTOM_BTN1 "part.popup.bottom.btn1" diff --git a/res/images/btn_act_menu_circle_bg.png b/res/images/btn_act_menu_circle_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..62b3c5dd327c360435ed466b0a7eae6f940555e1 GIT binary patch literal 5074 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 literal 0 HcmV?d00001 diff --git a/res/view/action_menu.edc b/res/view/action_menu.edc index 2388fa5..3bae7fb 100644 --- a/res/view/action_menu.edc +++ b/res/view/action_menu.edc @@ -113,6 +113,63 @@ group rel1.relative: 0.0 BUTTON_BG_HEIGHT; rel2.relative: 1.0 (BUTTON_BG_HEIGHT + ICONS_AREA_HEIGHT); } + + part + { + name: PART_ACT_MENU_ICO_BTN0; + type: SWALLOW; + scale: 1; + description + { + state: "default" 0.0; + rel1.relative: 0.0 0.0; + rel2.relative: 0.25 1.0; + align: 0.5 0.5; + max: 96 96; + } + } + part + { + name: PART_ACT_MENU_ICO_BTN1; + type: SWALLOW; + scale: 1; + description + { + state: "default" 0.0; + rel1.relative: 0.25 0.0; + rel2.relative: 0.5 1.0; + align: 0.5 0.5; + max: 96 96; + } + } + part + { + name: PART_ACT_MENU_ICO_BTN2; + type: SWALLOW; + scale: 1; + description + { + state: "default" 0.0; + rel1.relative: 0.5 0.0; + rel2.relative: 0.75 1.0; + align: 0.5 0.5; + max: 96 96; + } + } + part + { + name: PART_ACT_MENU_ICO_BTN3; + type: SWALLOW; + scale: 1; + description + { + state: "default" 0.0; + rel1.relative: 0.75 0.0; + rel2.relative: 1.0 1.0; + align: 0.5 0.5; + max: 96 96; + } + } } part diff --git a/res/widget/button.edc b/res/widget/button.edc index 096c085..8c71b5d 100644 --- a/res/widget/button.edc +++ b/res/widget/button.edc @@ -775,6 +775,63 @@ group { } } +#define BTN_ACT_MENU_CIRCLE_BG_PNG "btn_act_menu_circle_bg.png" + +group { + name, "elm/button/base/style.action.menu.icon.button"; + inherit, "elm/button/base/style.normal.button"; + images { + image, BTN_ACT_MENU_CIRCLE_BG_PNG COMP; + } + parts { + part { + name, "bg"; + type, IMAGE; + scale, 1; + description { + state, "default" 0.0; + min, 96 96; + align, 0.0 0.5; + image.normal, BTN_ACT_MENU_CIRCLE_BG_PNG; + color: COLOR_ITEM_BG; + fixed, 1 1; + } + description { + state, "focused" 0.0; + inherit, "default" 0.0; + color: COLOR_ITEM_FOCUS; + } + } + part { + name, "elm.text"; + type, TEXT; + repeat_events, 1; + scale, 1; + description { + state, "default" 0.0; + rel1.to, "bg.content"; + rel2.to, "bg.content"; + text { + font, FONT_LIGHT; + size, 12; + align, 0.5 0.5; + } + color, COLOR_TEXT_ITEM; + } + description { + state, "focused" 0.0; + inherit, "default" 0.0; + color, COLOR_TEXT_FOCUS; + } + description { + state, "disabled" 0.0; + inherit, "default" 0.0; + color, COLOR_TEXT_DISABLE; + } + } + } +} + group { name, "elm/button/base/style.option.button"; data.item, "focus_highlight" "on"; diff --git a/src/view/view_action_menu.c b/src/view/view_action_menu.c index afac090..bf9c3bc 100644 --- a/src/view/view_action_menu.c +++ b/src/view/view_action_menu.c @@ -156,6 +156,21 @@ static void _update(void *view_data, int update_type, void *data) if (!view_id) return; + /* Style demo code only: */ + + utils_add_button(((struct _priv *)view_data)->action_menu_layout, PART_ACT_MENU_ICO_BTN0, + "style.action.menu.icon.button", "XXXXXXXXX0"); + + utils_add_button(((struct _priv *)view_data)->action_menu_layout, PART_ACT_MENU_ICO_BTN1, + "style.action.menu.icon.button", "XXXXXXXXX1"); + + utils_add_button(((struct _priv *)view_data)->action_menu_layout, PART_ACT_MENU_ICO_BTN2, + "style.action.menu.icon.button", "XXXXXXXXX2"); + + utils_add_button(((struct _priv *)view_data)->action_menu_layout, PART_ACT_MENU_ICO_BTN3, + "style.action.menu.icon.button", "XXXXXXXXX3"); + + if (ACT_MENU_SRC_VIEW_UPDATE == update_type) { if (!strcmp(view_id, VIEW_BASE)) { -- 2.7.4