forked from enlightenment/efl
parent
cbbe439629
commit
c86d47ae59
|
@ -198,7 +198,7 @@ evas_event_feed_mouse_down(Evas *e, int b, Evas_Button_Flags flags, unsigned int
|
||||||
Evas_Event_Mouse_Down ev;
|
Evas_Event_Mouse_Down ev;
|
||||||
Evas_Object *obj;
|
Evas_Object *obj;
|
||||||
int addgrab = 0;
|
int addgrab = 0;
|
||||||
|
|
||||||
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
|
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
|
||||||
return;
|
return;
|
||||||
MAGIC_CHECK_END();
|
MAGIC_CHECK_END();
|
||||||
|
@ -450,7 +450,7 @@ evas_event_feed_mouse_up(Evas *e, int b, Evas_Button_Flags flags, unsigned int t
|
||||||
}
|
}
|
||||||
/* remove released touch point from the touch point list */
|
/* remove released touch point from the touch point list */
|
||||||
_evas_touch_point_remove(e, 0);
|
_evas_touch_point_remove(e, 0);
|
||||||
|
|
||||||
_evas_unwalk(e);
|
_evas_unwalk(e);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -18,21 +18,21 @@ evas_object_focus_set(Evas_Object *obj, Eina_Bool focus)
|
||||||
|
|
||||||
if (focus)
|
if (focus)
|
||||||
{
|
{
|
||||||
if (obj->focused) goto end;
|
if (obj->focused) goto end;
|
||||||
if (obj->layer->evas->focused)
|
if (obj->layer->evas->focused)
|
||||||
evas_object_focus_set(obj->layer->evas->focused, 0);
|
evas_object_focus_set(obj->layer->evas->focused, 0);
|
||||||
obj->focused = 1;
|
obj->focused = 1;
|
||||||
obj->layer->evas->focused = obj;
|
obj->layer->evas->focused = obj;
|
||||||
evas_object_event_callback_call(obj, EVAS_CALLBACK_FOCUS_IN, NULL);
|
evas_object_event_callback_call(obj, EVAS_CALLBACK_FOCUS_IN, NULL);
|
||||||
evas_event_callback_call(obj->layer->evas,
|
evas_event_callback_call(obj->layer->evas,
|
||||||
EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_IN, obj);
|
EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_IN, obj);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (!obj->focused) goto end;
|
if (!obj->focused) goto end;
|
||||||
obj->focused = 0;
|
obj->focused = 0;
|
||||||
obj->layer->evas->focused = NULL;
|
obj->layer->evas->focused = NULL;
|
||||||
evas_object_event_callback_call(obj, EVAS_CALLBACK_FOCUS_OUT, NULL);
|
evas_object_event_callback_call(obj, EVAS_CALLBACK_FOCUS_OUT, NULL);
|
||||||
evas_event_callback_call(obj->layer->evas,
|
evas_event_callback_call(obj->layer->evas,
|
||||||
EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_OUT, obj);
|
EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_OUT, obj);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue