GTK bookmark manager polish....

chrome/browser/gtk/bookmark_manager_gtk.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/gtk/bookmark_manager_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <vector>
 
 #include "app/gtk_dnd_util.h"
@@ skipping 1140 matching lines @@
 void BookmarkManagerGtk::OnRightTreeViewFocusIn(
     GtkTreeView* tree_view,
     GdkEventFocus* event,
     BookmarkManagerGtk* bm) {
   if (bm->organize_is_for_left_)
     bm->ResetOrganizeMenu(false);
 }
 
 // We do a couple things in this handler.
 //
-// 1. Ignore left clicks that occur below the lowest row so we don't try to
-// start an empty drag, or allow the user to start a drag on the selected
-// row by dragging on whitespace. This is the path == NULL return.
+// 1. On left clicks that occur below the lowest row, unselect all selected
+// rows. This is not a native GtkTreeView behavior, but it is added by libegg
+// and is thus present in Nautilus. This is the path == NULL path.
 // 2. Cache left clicks that occur on an already active selection. If the user
 // begins a drag, then we will throw away this event and initiate a drag on the
 // tree view manually. If the user doesn't begin a drag (e.g. just releases the
 // button), send both events to the tree view. This is a workaround for
 // http://crbug.com/15240. If we don't do this, when the user tries to drag
 // a group of selected rows, the click at the start of the drag will deselect
 // all rows except the one the cursor is over.
 //
 // We return TRUE for when we want to ignore events (i.e., stop the default
 // handler from handling them), and FALSE for when we want to continue
@@ skipping 16 matching lines @@
     bm->SendDelayedMousedown();
     return FALSE;
   }
 
   GtkTreePath* path;
   gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(tree_view),
                                 static_cast<gint>(event->x),
                                 static_cast<gint>(event->y),
                                 &path, NULL, NULL, NULL);
 
-  if (path == NULL)
-    return TRUE;
+  if (path == NULL) {
+    // Checking that the widget already has focus matches libegg behavior.
+    if (GTK_WIDGET_HAS_FOCUS(tree_view))
+      gtk_tree_selection_unselect_all(bm->right_selection());
+    return FALSE;
+  }
 
   if (gtk_tree_selection_path_is_selected(bm->right_selection(), path)) {
     bm->mousedown_event_ = *event;
     bm->delaying_mousedown_ = true;
     gtk_tree_path_free(path);
     return TRUE;
   }
 
   gtk_tree_path_free(path);
   return FALSE;
 }
 
 // static
 gboolean BookmarkManagerGtk::OnRightTreeViewMotion(
     GtkWidget* tree_view, GdkEventMotion* event, BookmarkManagerGtk* bm) {
-  // This handler is only used for the multi-drag workaround.
+  // Swallow motion events when no row is selected. This prevents the initiation
+  // of empty drags.
+  if (gtk_tree_selection_count_selected_rows(bm->right_selection()) == 0)
+    return TRUE;
+
+  // Otherwise this handler is only used for the multi-drag workaround.
   if (!bm->delaying_mousedown_)
     return FALSE;
 
   if (gtk_drag_check_threshold(tree_view,
                                static_cast<gint>(bm->mousedown_event_.x),
                                static_cast<gint>(bm->mousedown_event_.y),
                                static_cast<gint>(event->x),
                                static_cast<gint>(event->y))) {
     bm->delaying_mousedown_ = false;
     GtkTargetList* targets = GtkDndUtil::GetTargetListFromCodeMask(
@@ skipping 202 matching lines @@
       modifier & gtk_accelerator_get_default_mod_mask());
   // The only accelerator we have registered is ctrl+w, so any other value is a
   // non-fatal error.
   DCHECK_EQ(keyval, static_cast<guint>(GDK_w));
   DCHECK_EQ(modifier, GDK_CONTROL_MASK);
 
   gtk_widget_destroy(bookmark_manager->window_);
 
   return TRUE;
 }