kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

elm_win: fix keygrab bug to use wrong keygrab mode 

The code set worng ecore_x_keygrab mode according keygrab mode.
and changed some codes for readablity.
This commit is contained in:
Ji-Youn Park 2015-06-12 11:16:25 +09:00
parent 2fbe7d5103
commit bda0ccfb60
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
legacy/elementary/src/lib/elm_win.c
View File

@ -5044,19 +5044,28 @@ _elm_win_keygrab_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, const char *key, Eva
_internal_elm_win_xwindow_get(sd);
if (sd->x.xwin)
{
if (grab_mode == ELM_WIN_KEYGRAB_SHARED)
ret = ecore_x_window_keygrab_set(sd->x.xwin, key, 0, 0, 0, ECORE_X_WIN_KEYGRAB_SHARED);
else if (grab_mode == ELM_WIN_KEYGRAB_TOPMOST)
ret = ecore_x_window_keygrab_set(sd->x.xwin, key, 0, 0, 0, ECORE_X_WIN_KEYGRAB_TOPMOST);
else if (grab_mode == ELM_WIN_KEYGRAB_EXCLUSIVE)
ret = ecore_x_window_keygrab_set(sd->x.xwin, key, 0, 0, 0, ECORE_X_WIN_KEYGRAB_EXCLUSIVE);
else if (grab_mode == ELM_WIN_KEYGRAB_OVERRIDE_EXCLUSIVE)
ret = ecore_x_window_keygrab_set(sd->x.xwin, key, 0, 0, 0, ECORE_X_WIN_KEYGRAB_EXCLUSIVE);
Ecore_X_Win_Keygrab_Mode x_grab_mode;
switch (grab_mode)
{
case ELM_WIN_KEYGRAB_SHARED:
x_grab_mode = ECORE_X_WIN_KEYGRAB_SHARED;
break;
case ELM_WIN_KEYGRAB_TOPMOST:
x_grab_mode = ECORE_X_WIN_KEYGRAB_TOPMOST;
break;
case ELM_WIN_KEYGRAB_EXCLUSIVE:
x_grab_mode = ECORE_X_WIN_KEYGRAB_EXCLUSIVE;
break;
case ELM_WIN_KEYGRAB_OVERRIDE_EXCLUSIVE:
x_grab_mode = ECORE_X_WIN_KEYGRAB_OVERRIDE_EXCLUSIVE;
break;
default:
return ret;
}
ret = ecore_x_window_keygrab_set(sd->x.xwin, key, 0, 0, 0, x_grab_mode);
}
return ret;
#else
return ret;
#endif
return ret;
}
EOLIAN static Eina_Bool
@ -5067,10 +5076,8 @@ _elm_win_keygrab_unset(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, const char *key, E
_internal_elm_win_xwindow_get(sd);
if (sd->x.xwin)
ret = ecore_x_window_keygrab_unset(sd->x.xwin, key, 0, 0);
return ret;
#else
return ret;
#endif
return ret;
}
EOLIAN static Evas_Object*