forked from enlightenment/efl
gesture: Use new EO API to grab Ctrl key
See previous commit
This commit is contained in:
parent
2d6f53f2b9
commit
1f13696b84
|
@ -1498,17 +1498,14 @@ static void
|
||||||
_zoom_test_reset(Gesture_Info *gesture)
|
_zoom_test_reset(Gesture_Info *gesture)
|
||||||
{
|
{
|
||||||
Zoom_Type *st;
|
Zoom_Type *st;
|
||||||
Evas_Modifier_Mask mask;
|
|
||||||
|
|
||||||
EINA_SAFETY_ON_NULL_RETURN(gesture);
|
EINA_SAFETY_ON_NULL_RETURN(gesture);
|
||||||
if (!gesture->data) return;
|
if (!gesture->data) return;
|
||||||
ELM_GESTURE_LAYER_DATA_GET(gesture->obj, sd);
|
ELM_GESTURE_LAYER_DATA_GET(gesture->obj, sd);
|
||||||
|
|
||||||
st = gesture->data;
|
st = gesture->data;
|
||||||
mask = evas_key_modifier_mask_get(
|
efl_canvas_object_key_ungrab(sd->target, "Control_L", EFL_INPUT_MODIFIER_CONTROL, 0);
|
||||||
evas_object_evas_get(sd->target), "Control");
|
efl_canvas_object_key_ungrab(sd->target, "Control_R", EFL_INPUT_MODIFIER_CONTROL, 0);
|
||||||
evas_object_key_ungrab(sd->target, "Control_L", mask, 0);
|
|
||||||
evas_object_key_ungrab(sd->target, "Control_R", mask, 0);
|
|
||||||
|
|
||||||
memset(st, 0, sizeof(Zoom_Type));
|
memset(st, 0, sizeof(Zoom_Type));
|
||||||
st->zoom_distance_tolerance = sd->zoom_distance_tolerance;
|
st->zoom_distance_tolerance = sd->zoom_distance_tolerance;
|
||||||
|
@ -3265,16 +3262,16 @@ _zoom_with_wheel_test(Evas_Object *obj,
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{ /* On first wheel event, report START */
|
{ /* On first wheel event, report START */
|
||||||
Evas_Modifier_Mask mask = evas_key_modifier_mask_get(
|
|
||||||
evas_object_evas_get(sd->target), "Control");
|
|
||||||
force = EINA_FALSE;
|
force = EINA_FALSE;
|
||||||
s = ELM_GESTURE_STATE_START;
|
s = ELM_GESTURE_STATE_START;
|
||||||
if (!evas_object_key_grab
|
if (!efl_canvas_object_key_grab(sd->target, "Control_L",
|
||||||
(sd->target, "Control_L", mask, 0, EINA_FALSE))
|
EFL_INPUT_MODIFIER_CONTROL, 0,
|
||||||
ERR("Failed to Grabbed CTRL_L");
|
EINA_FALSE))
|
||||||
if (!evas_object_key_grab
|
ERR("Failed to grab left Ctrl");
|
||||||
(sd->target, "Control_R", mask, 0, EINA_FALSE))
|
if (!efl_canvas_object_key_grab(sd->target, "Control_R",
|
||||||
ERR("Failed to Grabbed CTRL_R");
|
EFL_INPUT_MODIFIER_CONTROL, 0,
|
||||||
|
EINA_FALSE))
|
||||||
|
ERR("Failed to grab right Ctrl");
|
||||||
}
|
}
|
||||||
|
|
||||||
st->zoom_distance_tolerance = 0; /* Cancel tolerance */
|
st->zoom_distance_tolerance = 0; /* Cancel tolerance */
|
||||||
|
|
Loading…
Reference in New Issue