enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

more accurately determine whether a mouse grab is active in some parts of e

This commit is contained in:
Mike Blumenkrantz 2015-04-27 14:32:19 -04:00
parent 0c7ff0b0e9
commit b632afa546
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/e_actions.c
View File

@ -1804,7 +1804,7 @@ ACT_FN_GO(menu_show, )
E_Zone *zone;
/* 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);
if (zone)
{
@ -1833,7 +1833,7 @@ ACT_FN_GO_MOUSE(menu_show, )
E_Zone *zone;
/* 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);
if (zone)
{
@ -1863,7 +1863,7 @@ ACT_FN_GO_KEY(menu_show, , EINA_UNUSED)
E_Zone *zone;
/* 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);
if (zone)
{

2
src/bin/e_fm.c
View File

@ -7517,7 +7517,7 @@ _e_fm2_cb_icon_mouse_in(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_U
ev = event_info;
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);
}

2
src/bin/e_zone.c
View File

@ -1501,7 +1501,7 @@ _e_zone_cb_bg_mouse_down(void *data,
E_Zone *zone;
zone = data;
if (e_menu_grab_window_get()) return;
if (e_comp_util_mouse_grabbed()) return;
if (!zone->cur_mouse_action)
{

2
src/modules/ibar/e_mod_main.c
View File

@ -1254,7 +1254,7 @@ _ibar_icon_menu_mouse_out(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA
{
IBar_Icon *ic = data;
if (e_menu_grab_window_get()) return;
if (e_comp_util_mouse_grabbed()) return;
if (ic->hide_timer)
ecore_timer_reset(ic->hide_timer);
else