more accurately determine whether a mouse grab is active in some parts of e
This commit is contained in:
parent
0c7ff0b0e9
commit
b632afa546
|
@ -1804,7 +1804,7 @@ ACT_FN_GO(menu_show, )
|
||||||
E_Zone *zone;
|
E_Zone *zone;
|
||||||
|
|
||||||
/* menu is active - abort */
|
/* menu is active - abort */
|
||||||
if (e_menu_grab_window_get()) return;
|
if (e_comp_util_kbd_grabbed() || e_comp_util_mouse_grabbed()) return;
|
||||||
zone = _e_actions_zone_get(obj);
|
zone = _e_actions_zone_get(obj);
|
||||||
if (zone)
|
if (zone)
|
||||||
{
|
{
|
||||||
|
@ -1833,7 +1833,7 @@ ACT_FN_GO_MOUSE(menu_show, )
|
||||||
E_Zone *zone;
|
E_Zone *zone;
|
||||||
|
|
||||||
/* menu is active - abort */
|
/* menu is active - abort */
|
||||||
if (e_menu_grab_window_get()) return;
|
if (e_comp_util_kbd_grabbed() || e_comp_util_mouse_grabbed()) return;
|
||||||
zone = _e_actions_zone_get(obj);
|
zone = _e_actions_zone_get(obj);
|
||||||
if (zone)
|
if (zone)
|
||||||
{
|
{
|
||||||
|
@ -1863,7 +1863,7 @@ ACT_FN_GO_KEY(menu_show, , EINA_UNUSED)
|
||||||
E_Zone *zone;
|
E_Zone *zone;
|
||||||
|
|
||||||
/* menu is active - abort */
|
/* menu is active - abort */
|
||||||
if (e_menu_grab_window_get()) return;
|
if (e_comp_util_kbd_grabbed() || e_comp_util_mouse_grabbed()) return;
|
||||||
zone = _e_actions_zone_get(obj);
|
zone = _e_actions_zone_get(obj);
|
||||||
if (zone)
|
if (zone)
|
||||||
{
|
{
|
||||||
|
|
|
@ -7517,7 +7517,7 @@ _e_fm2_cb_icon_mouse_in(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_U
|
||||||
ev = event_info;
|
ev = event_info;
|
||||||
|
|
||||||
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
|
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
|
||||||
if (e_menu_grab_window_get()) return;
|
if (e_comp_util_mouse_grabbed()) return;
|
||||||
evas_object_smart_callback_call(ic->sd->obj, "icon_mouse_in", &ic->info);
|
evas_object_smart_callback_call(ic->sd->obj, "icon_mouse_in", &ic->info);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1501,7 +1501,7 @@ _e_zone_cb_bg_mouse_down(void *data,
|
||||||
E_Zone *zone;
|
E_Zone *zone;
|
||||||
|
|
||||||
zone = data;
|
zone = data;
|
||||||
if (e_menu_grab_window_get()) return;
|
if (e_comp_util_mouse_grabbed()) return;
|
||||||
|
|
||||||
if (!zone->cur_mouse_action)
|
if (!zone->cur_mouse_action)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1254,7 +1254,7 @@ _ibar_icon_menu_mouse_out(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA
|
||||||
{
|
{
|
||||||
IBar_Icon *ic = data;
|
IBar_Icon *ic = data;
|
||||||
|
|
||||||
if (e_menu_grab_window_get()) return;
|
if (e_comp_util_mouse_grabbed()) return;
|
||||||
if (ic->hide_timer)
|
if (ic->hide_timer)
|
||||||
ecore_timer_reset(ic->hide_timer);
|
ecore_timer_reset(ic->hide_timer);
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue