mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2025-01-02 17:00:19 +00:00
Merge branch 'paned-no-grab' into 'master'
paned: Don't use a grab See merge request GNOME/gtk!644
This commit is contained in:
commit
f7e328e5f7
@ -35,7 +35,6 @@
|
|||||||
#include "gtkgesturesingle.h"
|
#include "gtkgesturesingle.h"
|
||||||
#include "gtkgizmoprivate.h"
|
#include "gtkgizmoprivate.h"
|
||||||
#include "gtkintl.h"
|
#include "gtkintl.h"
|
||||||
#include "gtkmain.h"
|
|
||||||
#include "gtkmarshalers.h"
|
#include "gtkmarshalers.h"
|
||||||
#include "gtkorientableprivate.h"
|
#include "gtkorientableprivate.h"
|
||||||
#include "gtkprivate.h"
|
#include "gtkprivate.h"
|
||||||
@ -768,7 +767,6 @@ gesture_drag_begin_cb (GtkGestureDrag *gesture,
|
|||||||
priv->drag_pos = start_y - handle_area.origin.y;
|
priv->drag_pos = start_y - handle_area.origin.y;
|
||||||
|
|
||||||
priv->panning = TRUE;
|
priv->panning = TRUE;
|
||||||
gtk_grab_add (GTK_WIDGET (paned));
|
|
||||||
|
|
||||||
gtk_gesture_set_state (GTK_GESTURE (gesture),
|
gtk_gesture_set_state (GTK_GESTURE (gesture),
|
||||||
GTK_EVENT_SEQUENCE_CLAIMED);
|
GTK_EVENT_SEQUENCE_CLAIMED);
|
||||||
@ -804,7 +802,6 @@ gesture_drag_end_cb (GtkGestureDrag *gesture,
|
|||||||
if (!priv->panning)
|
if (!priv->panning)
|
||||||
gtk_gesture_set_state (GTK_GESTURE (gesture), GTK_EVENT_SEQUENCE_DENIED);
|
gtk_gesture_set_state (GTK_GESTURE (gesture), GTK_EVENT_SEQUENCE_DENIED);
|
||||||
|
|
||||||
gtk_grab_remove (GTK_WIDGET (paned));
|
|
||||||
priv->panning = FALSE;
|
priv->panning = FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user