[mutter] window-x11: Simplify some grab op code
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] window-x11: Simplify some grab op code
- Date: Fri, 15 Aug 2014 17:47:20 +0000 (UTC)
commit f8dcea397574d3d618b4612f73666233b5819150
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Fri Aug 15 12:52:47 2014 -0400
window-x11: Simplify some grab op code
src/x11/window-x11.c | 23 ++---------------------
1 files changed, 2 insertions(+), 21 deletions(-)
---
diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c
index d4b9683..e8cf197 100644
--- a/src/x11/window-x11.c
+++ b/src/x11/window-x11.c
@@ -1854,27 +1854,8 @@ meta_window_move_resize_request (MetaWindow *window,
* Still have to do the ConfigureNotify and all, but pretend the
* app asked for the current size/position instead of the new one.
*/
- in_grab_op = FALSE;
- if (window->display->grab_op != META_GRAB_OP_NONE &&
- window == window->display->grab_window)
- {
- switch (window->display->grab_op)
- {
- case META_GRAB_OP_MOVING:
- case META_GRAB_OP_RESIZING_SE:
- case META_GRAB_OP_RESIZING_S:
- case META_GRAB_OP_RESIZING_SW:
- case META_GRAB_OP_RESIZING_N:
- case META_GRAB_OP_RESIZING_NE:
- case META_GRAB_OP_RESIZING_NW:
- case META_GRAB_OP_RESIZING_W:
- case META_GRAB_OP_RESIZING_E:
- in_grab_op = TRUE;
- break;
- default:
- break;
- }
- }
+ in_grab_op = (window->display->grab_window == window &&
+ meta_grab_op_is_mouse (window->display->grab_op));
/* it's essential to use only the explicitly-set fields,
* and otherwise use our current up-to-date position.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]