From ad19e0f5b78708b4566466e2b35074ad140b4294 Mon Sep 17 00:00:00 2001 From: Radek Kintop Date: Wed, 2 Mar 2016 10:54:43 +0100 Subject: [PATCH] Action menu as entire screen layout Change-Id: I644681d6290fb63f1d36cad5934118573e5b0479 Signed-off-by: Radek Kintop --- include/define.h | 1 + res/view/action_menu.edc | 15 ++++++++++++++- res/widget/button.edc | 16 ++++++++++++++++ src/view/view_action_menu.c | 7 +------ 4 files changed, 32 insertions(+), 7 deletions(-) diff --git a/include/define.h b/include/define.h index 084426a..6449355 100644 --- a/include/define.h +++ b/include/define.h @@ -142,6 +142,7 @@ /* Signals */ #define SIG_FOCUSED "elm,action,focus" #define SIG_UNFOCUSED "elm,action,unfocus" +#define SIG_ENABLED "elm,state,enabled" #define SIG_DISABLED "elm,state,disabled" #define SIG_SELECTED "selected" #define SIG_NOTAVAILABLE "state,notavailable" diff --git a/res/view/action_menu.edc b/res/view/action_menu.edc index a78a475..2388fa5 100644 --- a/res/view/action_menu.edc +++ b/res/view/action_menu.edc @@ -37,6 +37,19 @@ group { part { + type: RECT; + scale: 1; + repeat_events: 0; + description + { + state: "default" 0.0; + color: 0 0 0 0; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 1.0; + } + } + part + { name: "black bg"; type: RECT; scale: 1; @@ -44,7 +57,7 @@ group { state: "default" 0.0; color: 0 0 0 255; - rel1.relative: 0.0 0.0; + rel1.relative: 0.75 0.0; rel2.relative: 1.0 1.0; } part diff --git a/res/widget/button.edc b/res/widget/button.edc index 8c20b0d..096c085 100644 --- a/res/widget/button.edc +++ b/res/widget/button.edc @@ -586,6 +586,14 @@ group { target, PART_MENU_VALUE; } program { + name, "enabled"; + signal, SIG_ENABLED; + source, "elm"; + action, STATE_SET "default" 0.0; + target, "elm.text"; + target, PART_MENU_VALUE; + } + program { name, SIG_NOTAVAILABLE; signal, SIG_NOTAVAILABLE; source, ""; @@ -674,6 +682,14 @@ group { target, PART_MENU_VALUE; } program { + name, "enabled"; + signal, SIG_ENABLED; + source, "elm"; + action, STATE_SET "default" 0.0; + target, "elm.text"; + target, PART_MENU_VALUE; + } + program { name, SIG_NOTAVAILABLE; signal, SIG_NOTAVAILABLE; source, ""; diff --git a/src/view/view_action_menu.c b/src/view/view_action_menu.c index 51de160..afac090 100644 --- a/src/view/view_action_menu.c +++ b/src/view/view_action_menu.c @@ -21,8 +21,6 @@ #include "app_debug.h" #include "common/inputmgr.h" -#define ACT_MENU_WIDTH_PRCNT 0.75 - enum { LIVE_TV_BUTTON_ID, MORE_FAV_BUTTON_ID @@ -87,16 +85,13 @@ static Evas_Object *_create(Evas_Object *win, void *data) return NULL; } - priv->action_menu_layout = utils_add_layout(win, GRP_VIEW_ACTION_MENU, EINA_FALSE); + priv->action_menu_layout = utils_add_layout(win, GRP_VIEW_ACTION_MENU, EINA_TRUE); if (!priv->action_menu_layout) { free(priv); return NULL; } - evas_object_move(priv->action_menu_layout, ACT_MENU_WIDTH_PRCNT * w, 0); - evas_object_resize(priv->action_menu_layout, (1.0 - ACT_MENU_WIDTH_PRCNT) * w, h); - priv->live_tv_btn = utils_add_button(priv->action_menu_layout, PART_LIVE_TV_BTN, NULL, LIVE_TV_BTN_TXT); priv->more_fav_btn = utils_add_button(priv->action_menu_layout, PART_MORE_FAV_BTN, NULL, MORE_FAVS_BTN_TXT); -- 2.7.4