summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHyojung Jo <hj903.jo@samsung.com>2015-09-09 20:08:10 +0900
committerHyojung Jo <hj903.jo@samsung.com>2015-09-10 11:51:55 +0900
commit26c3511478ba35617abe2e581d19928d555f43a6 (patch)
tree8fd930db5f2618ba33473d975caaf25ab7c62812
parent39abdd5453f40fd547ba5e1e3df715bb87c231dc (diff)
downloadair_favorite-26c3511478ba35617abe2e581d19928d555f43a6.tar.gz
air_favorite-26c3511478ba35617abe2e581d19928d555f43a6.tar.bz2
air_favorite-26c3511478ba35617abe2e581d19928d555f43a6.zip
Change-Id: I3259b85c0aeab8cc862e50d46b2defe62a081e7a Signed-off-by: Hyojung Jo <hj903.jo@samsung.com>
-rw-r--r--res/favorite.edc2
-rw-r--r--src/view/view_action_menu.c19
2 files changed, 12 insertions, 9 deletions
diff --git a/res/favorite.edc b/res/favorite.edc
index 0e73759..1705237 100644
--- a/res/favorite.edc
+++ b/res/favorite.edc
@@ -482,7 +482,7 @@ collections {
to, "padding.menu.divider.up";
relative, 0.0 1.0;
}
- min, 250 124;
+ min, 0 124;
align, 0.0 0.0;
fixed, 1 1;
}
diff --git a/src/view/view_action_menu.c b/src/view/view_action_menu.c
index eb053ba..6f6b0f2 100644
--- a/src/view/view_action_menu.c
+++ b/src/view/view_action_menu.c
@@ -38,6 +38,7 @@ struct _priv {
Evas_Object *live_btn;
Evas_Object *menu_btn[COUNT_ACTION];
Evas_Object *banner;
+ int size_menu;
struct grid_data *gdata;
};
@@ -192,10 +193,11 @@ static void _set_focus_policy(struct _priv *priv)
elm_object_focus_next_object_set(priv->menu_btn[0], priv->menu_btn[0],
ELM_FOCUS_LEFT);
- elm_object_focus_next_object_set(priv->menu_btn[COUNT_ACTION - 1],
- priv->menu_btn[COUNT_ACTION - 1], ELM_FOCUS_RIGHT);
- for (i = 0; i < COUNT_ACTION; i++)
+ elm_object_focus_next_object_set(priv->menu_btn[priv->size_menu - 1],
+ priv->menu_btn[priv->size_menu - 1], ELM_FOCUS_RIGHT);
+
+ for (i = 0; i < priv->size_menu; i++)
elm_object_focus_next_object_set(priv->menu_btn[i],
priv->menu_btn[i], ELM_FOCUS_DOWN);
}
@@ -218,11 +220,7 @@ static void _set_action_state(int idx, Evas_Object *btn, struct _priv *priv)
if (locked)
elm_object_signal_emit(btn, SIG_TOGGLE,
SRC_ACTION_BTN);
-
- return;
}
-
- elm_object_disabled_set(btn, EINA_TRUE);
}
}
@@ -238,7 +236,12 @@ static bool _draw_action_area(struct _priv *priv)
return false;
}
- for (i = 0; i < COUNT_ACTION; i++) {
+ if (priv->gdata->item_locked)
+ priv->size_menu = COUNT_ACTION;
+ else
+ priv->size_menu = COUNT_ACTION - 1;
+
+ for (i = 0; i < priv->size_menu; i++) {
btn = utils_add_button(priv->base, NULL, action_info[i].title,
action_info[i].style);
if (!btn) {