AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

macos: No need to grab a seat

Browse Source 
The macOS DnD logic will take over anyway.
This commit is contained in:
Arjan Molenaar 2023-01-11 18:56:01 +01:00
parent b9847795a7
commit 27ee8b23fd
2 changed files with 0 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gdk/macos/gdkmacosdrag-private.h
View File

@ -41,7 +41,6 @@ struct _GdkMacosDrag
GdkDrag parent_instance; GdkDrag parent_instance;
GdkMacosDragSurface *drag_surface; GdkMacosDragSurface *drag_surface;
GdkSeat *drag_seat;
GdkCursor *cursor; GdkCursor *cursor;
int hot_x; int hot_x;

48
gdk/macos/gdkmacosdrag.c
View File

@ -188,47 +188,6 @@ gdk_macos_drag_set_cursor (GdkDrag *drag,
[nscursor set]; [nscursor set];
} }
static gboolean
drag_grab (GdkMacosDrag *self)
{
GdkSeat *seat;
g_assert (GDK_IS_MACOS_DRAG (self));
seat = gdk_device_get_seat (gdk_drag_get_device (GDK_DRAG (self)));
if (gdk_seat_grab (seat,
GDK_SURFACE (self->drag_surface),
GDK_SEAT_CAPABILITY_ALL_POINTING,
FALSE,
self->cursor,
NULL,
NULL,
NULL) != GDK_GRAB_SUCCESS)
return FALSE;
g_set_object (&self->drag_seat, seat);
return TRUE;
}
static void
drag_ungrab (GdkMacosDrag *self)
{
GdkDisplay *display;
g_assert (GDK_IS_MACOS_DRAG (self));
if (self->drag_seat)
{
gdk_seat_ungrab (self->drag_seat);
g_clear_object (&self->drag_seat);
}
display = gdk_drag_get_display (GDK_DRAG (self));
_gdk_macos_display_break_all_grabs (GDK_MACOS_DISPLAY (display), GDK_CURRENT_TIME);
}
static void static void
gdk_macos_drag_cancel (GdkDrag *drag, gdk_macos_drag_cancel (GdkDrag *drag,
GdkDragCancelReason reason) GdkDragCancelReason reason)
@ -241,7 +200,6 @@ gdk_macos_drag_cancel (GdkDrag *drag,
return; return;
self->cancelled = TRUE; self->cancelled = TRUE;
drag_ungrab (self);
gdk_drag_drop_done (drag, FALSE); gdk_drag_drop_done (drag, FALSE);
} }
@ -254,7 +212,6 @@ gdk_macos_drag_drop_performed (GdkDrag *drag,
g_assert (GDK_IS_MACOS_DRAG (self)); g_assert (GDK_IS_MACOS_DRAG (self));
g_object_ref (self); g_object_ref (self);
drag_ungrab (self);
g_signal_emit_by_name (drag, "dnd-finished"); g_signal_emit_by_name (drag, "dnd-finished");
gdk_drag_drop_done (drag, TRUE); gdk_drag_drop_done (drag, TRUE);
g_object_unref (self); g_object_unref (self);
@ -543,11 +500,6 @@ gdk_macos_drag_finalize (GObject *object)
GdkMacosDragSurface *drag_surface = g_steal_pointer (&self->drag_surface); GdkMacosDragSurface *drag_surface = g_steal_pointer (&self->drag_surface);
g_clear_object (&self->cursor); g_clear_object (&self->cursor);
if (self->drag_seat)
{
gdk_seat_ungrab (self->drag_seat);
g_clear_object (&self->drag_seat);
}
G_OBJECT_CLASS (gdk_macos_drag_parent_class)->finalize (object); G_OBJECT_CLASS (gdk_macos_drag_parent_class)->finalize (object);