osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Ensure we always show the selected frame when changing sort order. 

svn path=/trunk/; revision=34337
This commit is contained in:
Stig Bjørlykke 2010-10-02 16:41:20 +00:00
parent 63a5ecbbf0
commit 2e560e12a9
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gtk/new_packet_list.c
View File

@ -88,6 +88,7 @@ static void show_cell_data_func(GtkTreeViewColumn *col,
GtkTreeIter *iter,
gpointer data);
static gint row_number_from_iter(GtkTreeIter *iter);
static void scroll_to_current(void);
void new_packet_list_set_sel_browse(gboolean val, gboolean force_set);
@ -304,6 +305,8 @@ new_packet_list_sort_column (gint col_id, GtkTreeViewColumn *col, GtkSortType or
gtk_tree_view_column_set_sort_order (col, order);
g_object_set_data(G_OBJECT(packetlist->view), E_MPACKET_LIST_PREV_COLUMN_KEY, col);
gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(packetlist), col_id, order);
scroll_to_current ();
}
/*
@ -326,6 +329,7 @@ new_packet_list_column_clicked_cb (GtkTreeViewColumn *col, gpointer user_data _U
} else {
gtk_tree_view_column_set_sort_indicator(col, FALSE);
gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(packetlist), 0, GTK_SORT_ASCENDING);
scroll_to_current ();
}
}
@ -475,6 +479,7 @@ new_packet_list_column_menu_cb (GtkWidget *w, gpointer user_data _U_, COLUMN_SEL
case COLUMN_SELECTED_SORT_NONE:
gtk_tree_view_column_set_sort_indicator(col, FALSE);
gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(packetlist), 0, GTK_SORT_ASCENDING);
scroll_to_current ();
break;
case COLUMN_SELECTED_TOGGLE_RESOLVED:
new_packet_list_toggle_resolved (w, col_id);
@ -781,6 +786,26 @@ new_packet_list_resize_columns_cb(GtkWidget *widget _U_, gpointer data _U_)
new_packet_list_resize_columns();
}
static void
scroll_to_current(void)
{
GtkTreeSelection *selection;
GtkTreeIter iter;
GtkTreeModel *model;
GtkWidget *focus = gtk_window_get_focus(GTK_WINDOW(top_level));
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(packetlist->view));
/* model is filled with the current model as a convenience. */
if (!gtk_tree_selection_get_selected(selection, &model, &iter))
return;
scroll_to_and_select_iter(model, selection, &iter);
/* Set the focus back where it was */
if (focus)
gtk_window_set_focus(GTK_WINDOW(top_level), focus);
}
void
new_packet_list_next(void)
{