summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjinwoo.shin <jw0227.shin@samsung.com>2015-10-06 14:57:09 +0900
committerjinwoo.shin <jw0227.shin@samsung.com>2015-10-06 14:57:49 +0900
commit8acd793514c8a4f3c1c515a400133d8fde4a73f8 (patch)
treef5322c57d91b2410b23dae7adca7a1bd3a134e42
parent381ba2929801ddd18c422ffc3200b78c11af4391 (diff)
downloadair_livetv-8acd793514c8a4f3c1c515a400133d8fde4a73f8.tar.gz
air_livetv-8acd793514c8a4f3c1c515a400133d8fde4a73f8.tar.bz2
air_livetv-8acd793514c8a4f3c1c515a400133d8fde4a73f8.zip
Change-Id: I4d45e47236c515b6254c0b67f7674815ce6c8c69 Signed-off-by: jinwoo.shin <jw0227.shin@samsung.com>
-rw-r--r--data/view/action_menu.edc27
-rw-r--r--data/widget/button.edc36
-rw-r--r--src/view_action_menu.c5
3 files changed, 42 insertions, 26 deletions
diff --git a/data/view/action_menu.edc b/data/view/action_menu.edc
index ff4b944..d7b9485 100644
--- a/data/view/action_menu.edc
+++ b/data/view/action_menu.edc
@@ -321,36 +321,13 @@ group {
name, GRP_ACTION_MENU_BOTTOM;
parts {
part {
- name, "padding.more.btn";
- type, SPACER;
- scale, 1;
- description {
- state, "default" 0.0;
- rel1.relative, 0.0 0.0;
- rel2.relative, 1.0 0.0;
- min, 0 116;
- align, 0.0 0.0;
- fixed, 1 0;
- }
- }
-
- part {
name, PART_MORE_BUTTON;
type, SWALLOW;
scale, 1;
description {
state, "default" 0.0;
- rel1 {
- to, "padding.more.btn";
- relative, 0.5 0.5;
- }
- rel2 {
- to, "padding.more.btn";
- relative, 0.5 0.5;
- }
- min, 184 60;
- align, 0.5 0.5;
- fixed, 1 1;
+ min, 184 116;
+ align, 0.5 0.0;
}
}
}
diff --git a/data/widget/button.edc b/data/widget/button.edc
index fdc20e4..330dd36 100644
--- a/data/widget/button.edc
+++ b/data/widget/button.edc
@@ -209,6 +209,42 @@ group {
}
}
+group {
+ name, "elm/button/base/style.more.button";
+ inherit, "elm/button/base/style.livetv.button";
+ data.item, "focus_highlight" "on";
+ parts {
+ part {
+ name, "area";
+ type, SPACER;
+ mouse_events, 0;
+ scale, 1;
+ description {
+ state, "default" 0.0;
+ min, 184 116;
+ }
+ }
+
+ part {
+ name, "part.bg";
+ type, RECT;
+ scale, 1;
+ description {
+ state, "default" 0.0;
+ rel1.relative, 0.0 0.5;
+ rel2.relative, 1.0 0.5;
+ min, 0 60;
+ align, 0.0 0.5;
+ }
+ description {
+ state: "focused" 0.0;
+ inherit: "default" 0.0;
+ color: 0 119 246 255;
+ }
+ }
+ }
+}
+
#define DEFAULT 1
#define SELECTED 2
#define FOCUSED 3
diff --git a/src/view_action_menu.c b/src/view_action_menu.c
index b66b36c..c42aaba 100644
--- a/src/view_action_menu.c
+++ b/src/view_action_menu.c
@@ -38,6 +38,7 @@
#define KEY_BUTTON "KEY_BUTTON"
#define STYLE_LIVETV_BTN "style.livetv.button"
+#define STYLE_MORE_BTN "style.more.button"
#define STYLE_ACTION_MENU_BTN "style.action.menu.button"
#define STYLE_ACTION_MENU_FAVORITE "style.action.menu.favorite"
@@ -690,7 +691,7 @@ static bool _draw_bottom_area(struct _priv *priv)
elm_box_pack_end(priv->box, layout);
btn = util_add_button(layout,
- PART_MORE_BUTTON, STR_BUTTON_MORE, STYLE_LIVETV_BTN);
+ PART_MORE_BUTTON, STR_BUTTON_MORE, STYLE_MORE_BTN);
if (!btn) {
_ERR("failed to create more button");
return false;
@@ -829,6 +830,8 @@ static void _destroy(void *data)
}
priv = data;
+ elm_layout_signal_callback_del(priv->base, SIGNAL_HIDE_FINISHED,
+ SOURCE_ELM, _hide_finished_cb);
inputmgr_remove_all_by_tag(VIEW_ACTION_MENU);
evas_object_del(priv->base);