fix comp input ungrabbing to read more clearly and not pop nocomp wrongly
This commit is contained in:
parent
e1063c196b
commit
e24666b929
|
@ -1568,16 +1568,16 @@ e_comp_ungrab_input(Eina_Bool mouse, Eina_Bool kbd)
|
||||||
|
|
||||||
mouse = !!mouse;
|
mouse = !!mouse;
|
||||||
kbd = !!kbd;
|
kbd = !!kbd;
|
||||||
if (mouse && (e_comp->input_mouse_grabs == 1))
|
|
||||||
mwin = e_comp->ee_win;
|
|
||||||
if (kbd && (e_comp->input_key_grabs == 1))
|
|
||||||
kwin = e_comp->ee_win;
|
|
||||||
if (e_comp->input_mouse_grabs)
|
if (e_comp->input_mouse_grabs)
|
||||||
e_comp->input_mouse_grabs -= mouse;
|
e_comp->input_mouse_grabs -= mouse;
|
||||||
if (e_comp->input_key_grabs)
|
if (e_comp->input_key_grabs)
|
||||||
e_comp->input_key_grabs -= kbd;
|
e_comp->input_key_grabs -= kbd;
|
||||||
e_comp_override_timed_pop();
|
if (mouse && (!e_comp->input_mouse_grabs))
|
||||||
|
mwin = e_comp->ee_win;
|
||||||
|
if (kbd && (!e_comp->input_key_grabs))
|
||||||
|
kwin = e_comp->ee_win;
|
||||||
if ((!mwin) && (!kwin)) return;
|
if ((!mwin) && (!kwin)) return;
|
||||||
|
e_comp_override_timed_pop();
|
||||||
e_grabinput_release(mwin, kwin);
|
e_grabinput_release(mwin, kwin);
|
||||||
evas_event_feed_mouse_out(e_comp->evas, 0, NULL);
|
evas_event_feed_mouse_out(e_comp->evas, 0, NULL);
|
||||||
evas_event_feed_mouse_in(e_comp->evas, 0, NULL);
|
evas_event_feed_mouse_in(e_comp->evas, 0, NULL);
|
||||||
|
|
Loading…
Reference in New Issue