Merge lp:~jeremywootten/pantheon-files/fix-1467096-rubberbanding-from-blank-in-tree-view into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Do not allow rubberbanding to start in TreeView when not on a path (lp:1467096)

This branch fixes a problem with starting a rubberband selection on the blank are below the last row in TreeView (this seems to be a bug in Gtk.TreeView). It is now prohibited to start a rubberband selection this way (comparable file managers such as Thunar also prohibit this).

=== modified file 'src/View/AbstractDirectoryView.vala'
--- src/View/AbstractDirectoryView.vala	2015-07-08 22:12:30 +0000
+++ src/View/AbstractDirectoryView.vala	2015-07-12 19:00:59 +0000
@@ -2818,6 +2818,10 @@
                             result = expand_collapse (path);
                             break;
 
+                        case ClickZone.INVALID:
+                            result = true; /* Prevent rubberbanding */
+                            break;
+
                         default:
                             break;
                     }

=== modified file 'src/View/AbstractTreeView.vala'
--- src/View/AbstractTreeView.vala	2015-05-23 11:53:47 +0000
+++ src/View/AbstractTreeView.vala	2015-07-12 19:00:59 +0000
@@ -191,9 +191,10 @@
             tree.get_path_at_pos ((int)event.x, (int)event.y, out p, out c, out cx, out cy);
             path = p;
             depth = p != null ? p.get_depth () : 0;
-            zone = (p != null ? ClickZone.BLANK_PATH : ClickZone.BLANK_NO_PATH);
+            /* Do not allow rubberbanding to start except on a row in tree view */
+            zone = (p != null ? ClickZone.BLANK_PATH : ClickZone.INVALID);
 
-            if (c != null && c == name_column) {
+            if (p != null && c != null && c == name_column) {
                 int? x_offset = null, width = null;
                 c.cell_get_position (icon_renderer, out x_offset, out width);