Fix Shift+arrowkeys selection behavior in summaryview.

This fixes bugs #1959, #2490 (unselected lines still
appearing as selected), as well as #3513.

diff --git a/src/summaryview.c b/src/summaryview.c
index 4717efb102cd412413471b4dc7185d9d0002f587..aaf4d24d2fc16c789750d3386738675ecc287026 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -6796,12 +6796,28 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                return TRUE;
        case GDK_KEY_Home:
        case GDK_KEY_End:
                return TRUE;
        case GDK_KEY_Home:
        case GDK_KEY_End:

+       case GDK_KEY_Up:
+       case GDK_KEY_Down:

                if ((node = summaryview->selected) != NULL) {
                        GtkCMCTreeNode *next = NULL;
                if ((node = summaryview->selected) != NULL) {
                        GtkCMCTreeNode *next = NULL;

-                       next = (event->keyval == GDK_KEY_Home)
-                                       ? gtk_cmctree_node_nth(ctree, 0)
-                                       : gtk_cmctree_node_nth(ctree, 
-                                               g_list_length(GTK_CMCLIST(ctree)->row_list)-1);
+                       switch (event->keyval) {
+                               case GDK_KEY_Home:
+                                       next = gtk_cmctree_node_nth(ctree, 0);
+                                       break;
+                               case GDK_KEY_End:
+                                       next = gtk_cmctree_node_nth(ctree,
+                                                       g_list_length(GTK_CMCLIST(ctree)->row_list)-1);
+                                       break;
+                               case GDK_KEY_Up:
+                                       next = gtk_cmctree_node_nth(ctree,
+                                                       MAX(0, GTK_CMCLIST(ctree)->focus_row - 1));
+                                       break;
+                               case GDK_KEY_Down:
+                                       next = gtk_cmctree_node_nth(ctree,
+                                                       MIN(GTK_CMCLIST(ctree)->focus_row + 1, GTK_CMCLIST(ctree)->rows));
+                                       break;
+                       }
+

                        if (next) {
                                gtk_sctree_select_with_state
                                        (GTK_SCTREE(ctree), next, (event->state & ~GDK_CONTROL_MASK) );
                        if (next) {
                                gtk_sctree_select_with_state
                                        (GTK_SCTREE(ctree), next, (event->state & ~GDK_CONTROL_MASK) );