[Xfce4-commits] [xfce/thunar] 01/02: Allow <ctrl> + middle click in shortcut and treeview panes

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

hjudt pushed a commit to branch master
in repository xfce/thunar.

commit f60acf89a1321be0faa37bfb0d91b1757085ffa4
Author: Harald Judt <h.judt at gmx.at>
Date:   Thu Jan 15 14:41:22 2015 +0100

    Allow <ctrl> + middle click in shortcut and treeview panes
    
    Currently, only middle click is possible, without any modifiers.
    This patch enables <ctrl> + middle click, enabling the user
    to quickly switch (for that action only) the behaviour of
    opening folders to either "open in new window" or "open in new
    tab". This makes this behaviour equal to that of the
    icons/list/details views.
---
 thunar/thunar-shortcuts-view.c |   15 ++++++++++-----
 thunar/thunar-tree-view.c      |    9 +++++++--
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/thunar/thunar-shortcuts-view.c b/thunar/thunar-shortcuts-view.c
index 7de04b1..91c5294 100644
--- a/thunar/thunar-shortcuts-view.c
+++ b/thunar/thunar-shortcuts-view.c
@@ -430,7 +430,7 @@ thunar_shortcuts_view_button_press_event (GtkWidget      *widget,
   if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (widget), event->x, event->y, &path, NULL, NULL, NULL))
     {
       /* check if we should popup the context menu */
-      if (G_UNLIKELY (event->button == 3 && event->type == GDK_BUTTON_PRESS))
+      if (G_UNLIKELY (event->button == 3))
         {
           /* determine the iterator for the path */
           if (gtk_tree_model_get_iter (model, &iter, path))
@@ -442,14 +442,12 @@ thunar_shortcuts_view_button_press_event (GtkWidget      *widget,
               result = TRUE;
             }
         }
-      else if ((event->button == 1 || event->button == 2)
-               && event->type == GDK_BUTTON_PRESS
-               && (event->state & gtk_accelerator_get_default_mod_mask ()) == 0)
+      else if (event->button == 1 || event->button == 2)
         {
           /* check if we clicked the eject button area */
           column_width = gtk_tree_view_column_get_width (gtk_tree_view_get_column (GTK_TREE_VIEW (view), 0));
           gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &icon_width, &icon_height);
-          if (event->x >= column_width - icon_width - 3)
+          if (event->button == 1 && event->x >= column_width - icon_width - 3)
             {
               /* check if that shortcut actually has an eject button */
               model = gtk_tree_view_get_model (GTK_TREE_VIEW (view));
@@ -460,6 +458,8 @@ thunar_shortcuts_view_button_press_event (GtkWidget      *widget,
                     view->pressed_eject_button = 1;
                 }
             }
+          else
+              gtk_tree_view_set_cursor (GTK_TREE_VIEW (widget), path, NULL, FALSE);
 
           /* remember the button as pressed and handle it in the release handler */
           view->pressed_button = event->button;
@@ -503,6 +503,11 @@ thunar_shortcuts_view_button_release_event (GtkWidget      *widget,
         {
           /* button 2 opens in a new window or tab */
           g_object_get (view->preferences, "misc-middle-click-in-tab", &in_tab, NULL);
+
+          /* holding ctrl inverts the action */
+          if ((event->state & GDK_CONTROL_MASK) != 0)
+            in_tab = !in_tab;
+
           thunar_shortcuts_view_open (view, in_tab ? OPEN_IN_TAB : OPEN_IN_WINDOW);
         }
     }
diff --git a/thunar/thunar-tree-view.c b/thunar/thunar-tree-view.c
index e4661b0..9225cfe 100644
--- a/thunar/thunar-tree-view.c
+++ b/thunar/thunar-tree-view.c
@@ -715,9 +715,10 @@ thunar_tree_view_button_press_event (GtkWidget      *widget,
             }
         }
       else if ((event->button == 1 || event->button == 2)
-               && event->type == GDK_BUTTON_PRESS
-               && (event->state & gtk_accelerator_get_default_mod_mask ()) == 0)
+               && event->type == GDK_BUTTON_PRESS)
         {
+          gtk_tree_view_set_cursor (GTK_TREE_VIEW (widget), path, NULL, FALSE);
+
           /* remember the button as pressed and handled it in the release handler */
           view->pressed_button = event->button;
         }
@@ -749,6 +750,10 @@ thunar_tree_view_button_release_event (GtkWidget      *widget,
       else if (G_UNLIKELY (event->button == 2))
         {
           g_object_get (view->preferences, "misc-middle-click-in-tab", &in_tab, NULL);
+          /* holding ctrl inverts the action */
+          if ((event->state & GDK_CONTROL_MASK) != 0)
+            in_tab = !in_tab;
+
           if (in_tab)
             thunar_tree_view_action_open_in_new_tab (view);
           else

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.