diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-23 22:24:18 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-23 22:24:18 +0000 |
| commit | 39cc7ab72035866fdcfeb9537a8644f46bdc64cf (patch) | |
| tree | 1ca2d972e4cb337b182a481617a5618ba4c7f922 | |
| parent | e86f32612126b3f9bf77a2e85113e27728680b1f (diff) | |
| download | chromium_src-39cc7ab72035866fdcfeb9537a8644f46bdc64cf.zip chromium_src-39cc7ab72035866fdcfeb9537a8644f46bdc64cf.tar.gz chromium_src-39cc7ab72035866fdcfeb9537a8644f46bdc64cf.tar.bz2 | |
gtk: make right-clicking on task manager body show menu again
My change to make it show on mouse-down rather than up regressed this.
While I'm here, make it so we show the first column full title as a tooltip.
BUG=73081
Review URL: http://codereview.chromium.org/6580003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75802 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/gtk/task_manager_gtk.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/ui/gtk/task_manager_gtk.cc b/chrome/browser/ui/gtk/task_manager_gtk.cc index 4617c78..2b9a13b 100644 --- a/chrome/browser/ui/gtk/task_manager_gtk.cc +++ b/chrome/browser/ui/gtk/task_manager_gtk.cc @@ -172,6 +172,7 @@ void TreeViewInsertColumnWithPixbuf(GtkWidget* treeview, int resid) { GtkTreeViewColumn* column = gtk_tree_view_column_new(); gtk_tree_view_column_set_title(column, l10n_util::GetStringUTF8(resid).c_str()); + gtk_tree_view_set_tooltip_column(GTK_TREE_VIEW(treeview), colid); GtkCellRenderer* image_renderer = gtk_cell_renderer_pixbuf_new(); gtk_tree_view_column_pack_start(column, image_renderer, FALSE); gtk_tree_view_column_add_attribute(column, image_renderer, @@ -512,6 +513,10 @@ void TaskManagerGtk::Init() { gtk_tree_view_set_headers_clickable(GTK_TREE_VIEW(treeview_), TRUE); g_signal_connect(treeview_, "row-activated", G_CALLBACK(OnRowActivatedThunk), this); +#if defined(TOOLKIT_GTK) + g_signal_connect(treeview_, "button-press-event", + G_CALLBACK(OnButtonEventThunk), this); +#endif // |selection| is owned by |treeview_|. GtkTreeSelection* selection = gtk_tree_view_get_selection( @@ -965,10 +970,11 @@ void TaskManagerGtk::OnRowActivated(GtkWidget* widget, gboolean TaskManagerGtk::OnButtonEvent(GtkWidget* widget, GdkEventButton* event) { // GTK does menu on mouse-up while views does menu on mouse-down, - // so this function does different handlers. + // so this function can be called from either signal. if (event->button == 3) { ShowContextMenu(gfx::Point(event->x_root, event->y_root), event->time); + return TRUE; } return FALSE; |