From e1fc4bd12b4d7725113b7423fb4d2e60bf304434 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Tue, 18 Mar 2014 15:38:50 +0000 Subject: Update to 3.11.9 --- ...nt-drag-to-top-to-maximize-gesture-on-emu.patch | 135 --------------------- 1 file changed, 135 deletions(-) delete mode 100644 0002-x11-Implement-drag-to-top-to-maximize-gesture-on-emu.patch (limited to '0002-x11-Implement-drag-to-top-to-maximize-gesture-on-emu.patch') diff --git a/0002-x11-Implement-drag-to-top-to-maximize-gesture-on-emu.patch b/0002-x11-Implement-drag-to-top-to-maximize-gesture-on-emu.patch deleted file mode 100644 index 6758a5f..0000000 --- a/0002-x11-Implement-drag-to-top-to-maximize-gesture-on-emu.patch +++ /dev/null @@ -1,135 +0,0 @@ -From 41b73e409f7e30b8ba3b961013debaaf584b499c Mon Sep 17 00:00:00 2001 -From: Carlos Garnacho -Date: Thu, 13 Mar 2014 21:12:55 +0100 -Subject: [PATCH 2/3] x11: Implement "drag to top to maximize" gesture on - emulated window dragging - -And the counterpart to unmaximize when dragging a maximized window, if -touch devices aren't going to use EWMH moveresize, having this one at least -makes things feel a bit less awkward. - -https://bugzilla.gnome.org/show_bug.cgi?id=709914 ---- - gdk/x11/gdkwindow-x11.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++--- - 1 file changed, 70 insertions(+), 4 deletions(-) - -diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c -index 08ef713..83b3c7b 100644 ---- a/gdk/x11/gdkwindow-x11.c -+++ b/gdk/x11/gdkwindow-x11.c -@@ -4872,12 +4872,58 @@ get_move_resize_data (GdkDisplay *display, - } - - static void -+check_maximize (MoveResizeData *mv_resize, -+ gdouble x_root, -+ gdouble y_root) -+{ -+ GdkWindowState state; -+ gint y; -+ -+ if (mv_resize->is_resize) -+ return; -+ -+ state = gdk_window_get_state (mv_resize->moveresize_window); -+ -+ if (state & GDK_WINDOW_STATE_MAXIMIZED) -+ return; -+ -+ y = mv_resize->moveresize_orig_y + (y_root - mv_resize->moveresize_y); -+ -+ if (y < 10) -+ gdk_window_maximize (mv_resize->moveresize_window); -+} -+ -+static void -+check_unmaximize (MoveResizeData *mv_resize, -+ gdouble x_root, -+ gdouble y_root) -+{ -+ GdkWindowState state; -+ gint dx, dy; -+ -+ if (mv_resize->is_resize) -+ return; -+ -+ state = gdk_window_get_state (mv_resize->moveresize_window); -+ -+ if ((state & GDK_WINDOW_STATE_MAXIMIZED) == 0) -+ return; -+ -+ dx = x_root - mv_resize->moveresize_x; -+ dy = y_root - mv_resize->moveresize_y; -+ -+ if (ABS (dx) > 20 || ABS (dy) > 20) -+ gdk_window_unmaximize (mv_resize->moveresize_window); -+} -+ -+static void - update_pos (MoveResizeData *mv_resize, - gint new_root_x, - gint new_root_y) - { - gint dx, dy; - -+ check_unmaximize (mv_resize, new_root_x, new_root_y); - dx = new_root_x - mv_resize->moveresize_x; - dy = new_root_y - mv_resize->moveresize_y; - -@@ -5066,7 +5112,12 @@ _gdk_x11_moveresize_handle_event (XEvent *event) - * get a permanently stuck grab. - */ - if ((event->xmotion.state & button_mask) == 0) -- finish_drag (mv_resize); -+ { -+ check_maximize (mv_resize, -+ event->xmotion.x_root / impl->window_scale, -+ event->xmotion.y_root / impl->window_scale); -+ finish_drag (mv_resize); -+ } - break; - - case ButtonRelease: -@@ -5075,7 +5126,12 @@ _gdk_x11_moveresize_handle_event (XEvent *event) - event->xbutton.y_root / impl->window_scale); - - if (event->xbutton.button == mv_resize->moveresize_button) -- finish_drag (mv_resize); -+ { -+ check_maximize (mv_resize, -+ event->xmotion.x_root / impl->window_scale, -+ event->xmotion.y_root / impl->window_scale); -+ finish_drag (mv_resize); -+ } - break; - - #if defined (HAVE_XGENERICEVENTS) && defined (XINPUT_2) -@@ -5091,13 +5147,23 @@ _gdk_x11_moveresize_handle_event (XEvent *event) - update_pos (mv_resize, xev->root_x / impl->window_scale, xev->root_y / impl->window_scale); - state = _gdk_x11_device_xi2_translate_state (&xev->mods, &xev->buttons, &xev->group); - if ((state & button_mask) == 0) -- finish_drag (mv_resize); -+ { -+ check_maximize (mv_resize, -+ xev->root_x / impl->window_scale, -+ xev->root_y / impl->window_scale); -+ finish_drag (mv_resize); -+ } - break; - - case XI_ButtonRelease: - update_pos (mv_resize, xev->root_x / impl->window_scale, xev->root_y / impl->window_scale); - if (xev->detail == mv_resize->moveresize_button) -- finish_drag (mv_resize); -+ { -+ check_maximize (mv_resize, -+ xev->root_x / impl->window_scale, -+ xev->root_y / impl->window_scale); -+ finish_drag (mv_resize); -+ } - break; - } - } --- -1.9.0 - -- cgit