[Xfce4-commits] [xfce/thunar] 01/01: Improve drag & drop and selecting in the details view (bug #11605)
noreply at xfce.org
noreply at xfce.org
Mon Apr 20 13:07:58 CEST 2015
This is an automated email from the git hooks/post-receive script.
hjudt pushed a commit to branch master
in repository xfce/thunar.
commit bb9fe8ad3e2202be52fa5c987cb1a7744d20a0a6
Author: Harald Judt <h.judt at gmx.at>
Date: Tue Apr 7 19:27:12 2015 +0200
Improve drag & drop and selecting in the details view (bug #11605)
When using the left mouse button, clicking on the first column of an item
will select it or initiate dragging, but rubber banding is deactivated.
For the other columns, only rubber banding will be possible and dragging
be disabled.
When using the right mouse button, clicking on the first column of an
item will always select it and pop up the context menu of the item.
Clicking on another column of an unselected item will unselect all
items and show the menu of the folder, while clicking on another
column of a selected item will show the context menu for that item
(or those items).
An extensive explanation has been added to the thunar docs in the wiki:
http://docs.xfce.org/xfce/thunar/working-with-files-and-folders
---
thunar/thunar-details-view.c | 91 +++++++++++++++++++++++++++++++-----------
1 file changed, 68 insertions(+), 23 deletions(-)
diff --git a/thunar/thunar-details-view.c b/thunar/thunar-details-view.c
index d2e0a2e..a093434 100644
--- a/thunar/thunar-details-view.c
+++ b/thunar/thunar-details-view.c
@@ -659,8 +659,10 @@ thunar_details_view_button_press_event (GtkTreeView *tree_view,
ThunarDetailsView *details_view)
{
GtkTreeSelection *selection;
- GtkTreePath *path;
+ GtkTreePath *path = NULL;
GtkTreeIter iter;
+ GtkTreeViewColumn *column;
+ GtkTreeViewColumn *first_column;
ThunarFile *file;
GtkAction *action;
ThunarPreferences *preferences;
@@ -671,41 +673,85 @@ thunar_details_view_button_press_event (GtkTreeView *tree_view,
if (G_UNLIKELY (event->window != gtk_tree_view_get_bin_window (tree_view)))
return FALSE;
- /* we unselect all selected items if the user clicks on an empty
- * area of the treeview and no modifier key is active.
- */
+ /* get the current selection */
+ selection = gtk_tree_view_get_selection (tree_view);
+
+ /* get the first column of the tree view */
+ first_column = gtk_tree_view_get_column (tree_view, 0);
+
+ /* unselect all selected items if the user clicks on an empty area
+ * of the treeview and no modifier key is active */
if ((event->state & gtk_accelerator_get_default_mod_mask ()) == 0
- && !gtk_tree_view_get_path_at_pos (tree_view, event->x, event->y, NULL, NULL, NULL, NULL))
- {
- selection = gtk_tree_view_get_selection (tree_view);
+ && !gtk_tree_view_get_path_at_pos (tree_view, event->x, event->y, &path, &column, NULL, NULL))
gtk_tree_selection_unselect_all (selection);
- }
- /* open the context menu on right clicks */
- if (event->type == GDK_BUTTON_PRESS && event->button == 3)
+ /* if the user clicked on a row with the left button */
+ if (path != NULL && event->type == GDK_BUTTON_PRESS && event->button == 1)
{
- selection = gtk_tree_view_get_selection (tree_view);
- if (gtk_tree_view_get_path_at_pos (tree_view, event->x, event->y, &path, NULL, NULL, NULL))
+ GtkTreePath *cursor_path;
+
+ /* grab the tree view */
+ gtk_widget_grab_focus (GTK_WIDGET (tree_view));
+
+ gtk_tree_view_get_cursor (tree_view, &cursor_path, NULL);
+ if (cursor_path != NULL)
{
- /* select the path on which the user clicked if not selected yet */
- if (!gtk_tree_selection_path_is_selected (selection, path))
+ gtk_tree_path_free (cursor_path);
+
+ if (column != first_column)
+ gtk_tree_selection_unselect_all (selection);
+
+ /* do not start rubber banding from the first column */
+ if (!gtk_tree_selection_path_is_selected (selection, path)
+ && column == first_column)
{
- /* only select an item if Control is not pressed, else we
- * use this to popup the current directory actionW */
+ /* the clicked row does not have the focus and is not
+ * selected, so make it the new selection (start) */
gtk_tree_selection_unselect_all (selection);
- if ((event->state & GDK_CONTROL_MASK) == 0)
- gtk_tree_selection_select_path (selection, path);
+ gtk_tree_selection_select_path (selection, path);
+
+ gtk_tree_path_free (path);
+
+ /* return FALSE to not abort dragging */
+ return FALSE;
}
gtk_tree_path_free (path);
-
- /* queue the menu popup */
- thunar_standard_view_queue_popup (THUNAR_STANDARD_VIEW (details_view), event);
}
- else
+ }
+
+ /* open the context menu on right clicks */
+ if (event->type == GDK_BUTTON_PRESS && event->button == 3)
+ {
+ if (path == NULL)
{
/* open the context menu */
thunar_standard_view_context_menu (THUNAR_STANDARD_VIEW (details_view), event->button, event->time);
}
+ else
+ {
+ if (column != first_column)
+ {
+ /* if the clicked path is not selected, unselect all other paths */
+ if (!gtk_tree_selection_path_is_selected (selection, path))
+ gtk_tree_selection_unselect_all (selection);
+
+ /* queue the menu popup */
+ thunar_standard_view_queue_popup (THUNAR_STANDARD_VIEW (details_view), event);
+ }
+ else
+ {
+ /* select the clicked path if necessary */
+ if (!gtk_tree_selection_path_is_selected (selection, path))
+ {
+ gtk_tree_selection_unselect_all (selection);
+ gtk_tree_selection_select_path (selection, path);
+ }
+
+ /* show the context menu */
+ thunar_standard_view_context_menu (THUNAR_STANDARD_VIEW (details_view), event->button, event->time);
+ }
+ gtk_tree_path_free (path);
+ }
return TRUE;
}
@@ -715,7 +761,6 @@ thunar_details_view_button_press_event (GtkTreeView *tree_view,
if (gtk_tree_view_get_path_at_pos (tree_view, event->x, event->y, &path, NULL, NULL, NULL))
{
/* select only the path to the item on which the user clicked */
- selection = gtk_tree_view_get_selection (tree_view);
gtk_tree_selection_unselect_all (selection);
gtk_tree_selection_select_path (selection, path);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list