mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make the dive selection logic also set the treeview cursor

Browse source 
This fixes "enter" after moving around with the cursor keys.

Hinted-at-by: Carl Worth <cworth@cworth.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Linus Torvalds 2013-01-31 16:56:51 +11:00 • committed by Dirk Hohndel
parent d37f8736db
commit b93f2ec6c3
1 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

25
divelist.c
View file

@ -1250,6 +1250,8 @@ static void clear_trip_indexes(void)
trip->index = 0; trip->index = 0;
} }
/* Select the iter asked for, and set the keyboard focus on it */
static void go_to_iter(GtkTreeSelection *selection, GtkTreeIter *iter);
static void fill_dive_list(void) static void fill_dive_list(void)
{ {
int i, trip_index = 0; int i, trip_index = 0;
@ -1344,7 +1346,7 @@ static void fill_dive_list(void)
gtk_tree_model_get(MODEL(dive_list), &iter, DIVE_INDEX, &selected_dive, -1); gtk_tree_model_get(MODEL(dive_list), &iter, DIVE_INDEX, &selected_dive, -1);
first_leaf(MODEL(dive_list), &iter, &selected_dive); first_leaf(MODEL(dive_list), &iter, &selected_dive);
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dive_list.tree_view)); selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dive_list.tree_view));
gtk_tree_selection_select_iter(selection, &iter); go_to_iter(selection, &iter);
} }
} }
@ -2876,6 +2878,19 @@ void show_and_select_dive(struct dive *dive)
scroll_to_selected(iter); scroll_to_selected(iter);
} }
static void go_to_iter(GtkTreeSelection *selection, GtkTreeIter *iter)
{
GtkTreePath *path;
scroll_to_selected(iter);
gtk_tree_selection_unselect_all(selection);
gtk_tree_selection_select_iter(selection, iter);
path = gtk_tree_model_get_path(GTK_TREE_MODEL(dive_list.model), iter);
gtk_tree_view_set_cursor(GTK_TREE_VIEW(dive_list.tree_view), path, NULL, FALSE);
gtk_tree_path_free(path);
}
void select_next_dive(void) void select_next_dive(void)
{ {
GtkTreeIter *nextiter, *parent; GtkTreeIter *nextiter, *parent;
@ -2903,9 +2918,7 @@ void select_next_dive(void)
if (! gtk_tree_model_iter_children(MODEL(dive_list), nextiter, parent)) if (! gtk_tree_model_iter_children(MODEL(dive_list), nextiter, parent))
return; return;
} }
scroll_to_selected(nextiter); go_to_iter(selection, nextiter);
gtk_tree_selection_unselect_all(selection);
gtk_tree_selection_select_iter(selection, nextiter);
} }
void select_prev_dive(void) void select_prev_dive(void)
@ -2941,9 +2954,7 @@ void select_prev_dive(void)
gtk_tree_model_iter_n_children(MODEL(dive_list), parent) - 1)) gtk_tree_model_iter_n_children(MODEL(dive_list), parent) - 1))
goto free_path; goto free_path;
} }
scroll_to_selected(&previter); go_to_iter(selection, &previter);
gtk_tree_selection_unselect_all(selection);
gtk_tree_selection_select_iter(selection, &previter);
free_path: free_path:
gtk_tree_path_free(treepath); gtk_tree_path_free(treepath);
} }