From: Daniel Boles Date: Tue, 27 Jun 2023 08:54:52 +0000 (+0100) Subject: DropTarget: Fix `if` block indented 1 step too far X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~1^2~89^2~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6252517aacccfa8377b841a1e92bf93d7e67a487;p=gtk4.git DropTarget: Fix `if` block indented 1 step too far --- diff --git a/gtk/gtkdroptarget.c b/gtk/gtkdroptarget.c index e5f34ac629..f99c476ac4 100644 --- a/gtk/gtkdroptarget.c +++ b/gtk/gtkdroptarget.c @@ -508,12 +508,13 @@ gtk_drop_target_handle_crossing (GtkEventController *controller, gtk_drop_target_start_drop (self, crossing->drop); g_signal_emit (self, signals[ENTER], 0, x, y, &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 (!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 && gtk_drop_status (self->drop, self->actions, preferred)) { @@ -533,6 +534,7 @@ gtk_drop_target_handle_crossing (GtkEventController *controller, g_signal_emit (self, signals[LEAVE], 0); if (!self->dropping) gtk_drop_target_end_drop (self); + gtk_widget_unset_state_flags (widget, GTK_STATE_FLAG_DROP_ACTIVE); } }