resi
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Increment/Decrement button count in the button handlers, not in the 

border hooks.

Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2013-08-16 09:49:52 +01:00
parent 85d881d57b
commit 9325324c03
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/modules/wl_desktop_shell/e_mod_main.c
View File

@ -1526,16 +1526,11 @@ _e_wl_shell_shell_surface_cb_bd_move_end(void *data, void *bd)
/* is the shell surface the same one in the grab ? */
if ((ptr->current) && (ptr->current != ews->wl.surface)) return;
ptr->button_count--;
/* send this button press to the pointer */
ptr->grab->interface->button(ptr->grab,
ptr->grab_time,
ptr->grab_button,
WL_POINTER_BUTTON_STATE_RELEASED);
if (ptr->button_count == 1)
ptr->grab_serial = wl_display_get_serial(_e_wl_comp->wl.display);
}
}
@ -1608,16 +1603,11 @@ _e_wl_shell_shell_surface_cb_bd_resize_end(void *data, void *bd)
/* is the shell surface the same one in the grab ? */
if ((ptr->current) && (ptr->current != ews->wl.surface)) return;
ptr->button_count--;
/* send this button press to the pointer */
ptr->grab->interface->button(ptr->grab,
ptr->grab_time,
ptr->grab_button,
WL_POINTER_BUTTON_STATE_RELEASED);
if (ptr->button_count == 1)
ptr->grab_serial = wl_display_get_serial(_e_wl_comp->wl.display);
}
}
@ -2092,6 +2082,14 @@ _e_wl_shell_move_grab_cb_button(struct wl_pointer_grab *grab, unsigned int times
/* try to get the pointer */
if (!(ptr = grab->pointer)) return;
if (state == WL_POINTER_BUTTON_STATE_RELEASED)
ptr->button_count--;
else
ptr->button_count++;
if (ptr->button_count == 1)
ptr->grab_serial = wl_display_get_serial(_e_wl_comp->wl.display);
/* test if we are done with the grab */
if ((ptr->button_count == 0) &&
(state == WL_POINTER_BUTTON_STATE_RELEASED))
@ -2168,6 +2166,14 @@ _e_wl_shell_resize_grab_cb_button(struct wl_pointer_grab *grab, unsigned int tim
/* try to get the pointer */
if (!(ptr = grab->pointer)) return;
if (state == WL_POINTER_BUTTON_STATE_RELEASED)
ptr->button_count--;
else
ptr->button_count++;
if (ptr->button_count == 1)
ptr->grab_serial = wl_display_get_serial(_e_wl_comp->wl.display);
/* test if we are done with the grab */
if ((ptr->button_count == 0) &&
(state == WL_POINTER_BUTTON_STATE_RELEASED))