debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix keyboard navigation in suggestions

Browse source
This commit is contained in:
Alexander Butenko 2012-01-07 22:55:18 -04:00 committed by Christian Dywan
parent 696b377b32
commit 3d5d2f4766
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extensions/formhistory/formhistory-frontend.h
View file

@ -35,7 +35,7 @@ typedef struct
GtkWidget* popup; GtkWidget* popup;
GtkWidget* root; GtkWidget* root;
gchar* oldkeyword; gchar* oldkeyword;
guint selection_index; glong selection_index;
#else #else
gchar* jsforms; gchar* jsforms;
#endif #endif

8
extensions/formhistory/formhistory-gdom-frontend.c
View file

@ -272,16 +272,18 @@ formhistory_editbox_key_pressed_cb (WebKitDOMElement* element,
matches = gtk_tree_model_iter_n_children (priv->completion_model, NULL); matches = gtk_tree_model_iter_n_children (priv->completion_model, NULL);
if (key == 38) if (key == 38)
{ {
if (priv->selection_index == -1) if (priv->selection_index <= 0)
priv->selection_index = matches - 1; priv->selection_index = matches - 1;
else else
priv->selection_index = MAX (priv->selection_index - 1, 1); priv->selection_index = MAX (priv->selection_index - 1, 0);
} }
else else
{ {
if (priv->selection_index == matches - 1)
priv->selection_index = 0;
else
priv->selection_index = MIN (priv->selection_index + 1, matches -1); priv->selection_index = MIN (priv->selection_index + 1, matches -1);
} }
path = gtk_tree_path_new_from_indices (priv->selection_index, -1); path = gtk_tree_path_new_from_indices (priv->selection_index, -1);
gtk_tree_view_set_cursor (GTK_TREE_VIEW (priv->treeview), path, NULL, FALSE); gtk_tree_view_set_cursor (GTK_TREE_VIEW (priv->treeview), path, NULL, FALSE);
formhistory_suggestion_set (path, priv); formhistory_suggestion_set (path, priv);