[EGIT] [core/elementary] elementary-1.9 01/01: ctxpopup: sd->box null check and event_flag set for previous and next focus move.

[Jaeun Choi]

hermet pushed a commit to branch elementary-1.9.

http://git.enlightenment.org/core/elementary.git/commit/?id=634c4b7ec0af18e52603fa47bec38096969d489c

commit 634c4b7ec0af18e52603fa47bec38096969d489c
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
    
    Conflicts:
    
        src/lib/elc_ctxpopup.c
---
 src/lib/elc_ctxpopup.c | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index 979f622..812a978 100644
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -130,19 +130,16 @@ _elm_ctxpopup_smart_event(Eo *obj, void *_pd, va_list 
*list)
    if (type != EVAS_CALLBACK_KEY_DOWN) return;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
 
-   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);
-        if (ret) *ret = EINA_TRUE;
-        return;
-     }
-
    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")) ||

--