hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=528a6a96b436e2b29944e37b8415fdbbba0476f2
commit 528a6a96b436e2b29944e37b8415fdbbba0476f2
Author: Jaeun Choi <jaeun12.c...@samsung.com>
Date: Thu Apr 17 15:23:00 2014 +0900
ctxpopup: sd->box null check and event_flag set for previous and next focus
move.
Summary:
The original code was missing
- null check of sd->box
- event_flag value set
for previous and next focus move.
@fix
Test Plan: None
Reviewers: raster, seoz, Hermet
Differential Revision: https://phab.enlightenment.org/D753
---
src/lib/elc_ctxpopup.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index 0812098..5dffe28 100644
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -103,18 +103,16 @@ _elc_ctxpopup_elm_widget_event(Eo *obj, Elc_Ctxpopup_Data
*sd, Evas_Object *src,
if (type != EVAS_CALLBACK_KEY_DOWN) return EINA_FALSE;
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return EINA_FALSE;
- if (!strcmp(ev->key, "Tab"))
- {
- if (evas_key_modifier_is_set(ev->modifiers, "Shift"))
- elm_widget_focus_cycle(sd->box, ELM_FOCUS_PREVIOUS);
- else
- elm_widget_focus_cycle(sd->box, ELM_FOCUS_NEXT);
- return EINA_TRUE;
- }
-
if (sd->box)
{
- if ((!strcmp(ev->key, "Left")) ||
+ if (!strcmp(ev->key, "Tab"))
+ {
+ if (evas_key_modifier_is_set(ev->modifiers, "Shift"))
+ elm_widget_focus_cycle(sd->box, ELM_FOCUS_PREVIOUS);
+ else
+ elm_widget_focus_cycle(sd->box, ELM_FOCUS_NEXT);
+ }
+ else if ((!strcmp(ev->key, "Left")) ||
((!strcmp(ev->key, "KP_Left")) && (!ev->string)))
elm_widget_focus_cycle(sd->box, ELM_FOCUS_LEFT);
else if ((!strcmp(ev->key, "Right")) ||
--
