[nautilus] list-base: Update drop action propperly on location switch



commit e39102ede3e4cf4c9c3a8bc28e268cae6f340838
Author: António Fernandes <antoniof gnome org>
Date:   Sat Jul 2 19:27:46 2022 +0100

    list-base: Update drop action propperly on location switch
    
    We've been setting the view drop action from the item drop action.
    This assumes the location was switched by hovering a view item.
    
    However, the view may get switched by hovering the pathbar or the
    sidebar, where this assumption doesn't hold.
    
    So, we must properly recompute the preferred action.

 src/nautilus-list-base.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/src/nautilus-list-base.c b/src/nautilus-list-base.c
index ef08775a3..b7335acc7 100644
--- a/src/nautilus-list-base.c
+++ b/src/nautilus-list-base.c
@@ -50,6 +50,7 @@ struct _NautilusListBasePrivate
     GdkDragAction drag_item_action;
     GdkDragAction drag_view_action;
     guint hover_timer_id;
+    GtkDropTarget *view_drop_target;
 };
 
 G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (NautilusListBase, nautilus_list_base, NAUTILUS_TYPE_FILES_VIEW)
@@ -934,7 +935,8 @@ real_begin_loading (NautilusFilesView *files_view)
 
     /* When DnD is used to navigate between directories, the normal callbacks
      * are ignored. Update DnD variables here upon navigating to a directory*/
-    priv->drag_view_action = priv->drag_item_action;
+    priv->drag_view_action = get_preferred_action (nautilus_files_view_get_directory_as_file (files_view),
+                                                   gtk_drop_target_get_value (priv->view_drop_target));
     priv->drag_item_action = 0;
 }
 
@@ -1701,6 +1703,7 @@ nautilus_list_base_get_model (NautilusListBase *self)
 void
 nautilus_list_base_setup_gestures (NautilusListBase *self)
 {
+    NautilusListBasePrivate *priv = nautilus_list_base_get_instance_private (self);
     GtkWidget *view_ui = nautilus_list_base_get_view_ui (self);
     GtkEventController *controller;
     GtkDropTarget *drop_target;
@@ -1727,4 +1730,5 @@ nautilus_list_base_setup_gestures (NautilusListBase *self)
     g_signal_connect (drop_target, "motion", G_CALLBACK (on_view_drag_motion), self);
     g_signal_connect (drop_target, "drop", G_CALLBACK (on_view_drop), self);
     gtk_widget_add_controller (GTK_WIDGET (self), GTK_EVENT_CONTROLLER (drop_target));
+    priv->view_drop_target = drop_target;
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]