Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dboles/issue5922-DropTarget-reject-enter-critical' into 'main'

Browse Source 
DropTarget: Fix critical if `reject()` drop before `::enter`

Closes #5922

See merge request GNOME/gtk!6152
This commit is contained in:
Benjamin Otte
2023-06-27 21:30:03 +00:00
parent 51e440fa03 dfa6591675
commit 526771751f
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
gtk/gtkdroptarget.c
View File

@@ -507,13 +507,19 @@ gtk_drop_target_handle_crossing (GtkEventController *controller,
graphene_point_init (&self->coords, x, y); graphene_point_init (&self->coords, x, y);
gtk_drop_target_start_drop (self, crossing->drop); gtk_drop_target_start_drop (self, crossing->drop);
g_signal_emit (self, signals[ENTER], 0, x, y, &preferred); /* start_drop ends w/ thaw_notify, where handler may reject, so recheck */
if (!gdk_drag_action_is_unique (preferred)) if (self->drop != NULL)
{ g_signal_emit (self, signals[ENTER], 0, x, y, &preferred);
g_critical ("Handler for GtkDropTarget::enter on %s %p did not return a unique preferred action", else
G_OBJECT_TYPE_NAME (widget), widget); preferred = 0;
preferred = make_action_unique (preferred);
} if (!gdk_drag_action_is_unique (preferred))
{
g_critical ("Handler for GtkDropTarget::enter on %s %p did not return a unique preferred action",
G_OBJECT_TYPE_NAME (widget), widget);
preferred = make_action_unique (preferred);
}
if (preferred && if (preferred &&
gtk_drop_status (self->drop, self->actions, preferred)) gtk_drop_status (self->drop, self->actions, preferred))
{ {
@@ -533,6 +539,7 @@ gtk_drop_target_handle_crossing (GtkEventController *controller,
g_signal_emit (self, signals[LEAVE], 0); g_signal_emit (self, signals[LEAVE], 0);
if (!self->dropping) if (!self->dropping)
gtk_drop_target_end_drop (self); gtk_drop_target_end_drop (self);
gtk_widget_unset_state_flags (widget, GTK_STATE_FLAG_DROP_ACTIVE); gtk_widget_unset_state_flags (widget, GTK_STATE_FLAG_DROP_ACTIVE);
} }
} }