Changeset 11675

Timestamp:

Jan 15, 2011, 7:57:01 AM (12 years ago)

Author:

jordan

Message:

(trunk gtk) #3903 "Scroll to new messages when viewing new messages in the message window" -- added.

File:

• trunk/gtk/msgwin.c (modified) (9 diffs)

trunk/gtk/msgwin.c

@@ -51 +51 @@
 static struct tr_msg_list * myHead = NULL;
 
-/***
-****
-***/
+/****
+*****
+****/
+
+/* is the user looking at the latest messages? */
+static gboolean
+is_pinned_to_new( struct MsgData * data )
+{
+    gboolean pinned_to_new;
+
+    if( data->view == NULL )
+    {
+        pinned_to_new = TRUE;
+    }
+    else
+    {
+        GtkTreePath * last_visible;
+        if( gtk_tree_view_get_visible_range( data->view, NULL, &last_visible ) )
+        {
+            GtkTreeIter iter;
+            const int row_count = gtk_tree_model_iter_n_children( data->sort, NULL );
+            if( gtk_tree_model_iter_nth_child( data->sort, &iter, NULL, row_count-1 ) )
+            {
+                GtkTreePath * last_row = gtk_tree_model_get_path( data->sort, &iter );
+                pinned_to_new = !gtk_tree_path_compare( last_visible, last_row );
+                gtk_tree_path_free( last_row );
+            }
+            gtk_tree_path_free( last_visible );
+        }
+    }
+
+    return pinned_to_new;
+}
+
+static void
+scroll_to_bottom( struct MsgData * data )
+{
+    if( data->sort != NULL )
+    {
+        GtkTreeIter iter;
+        const int row_count = gtk_tree_model_iter_n_children( data->sort, NULL );
+        if( gtk_tree_model_iter_nth_child( data->sort, &iter, NULL, row_count-1 ) )
+        {
+            GtkTreePath * last_row = gtk_tree_model_get_path( data->sort, &iter );
+            gtk_tree_view_scroll_to_cell( data->view, last_row, NULL, TRUE, 1, 0 );
+            gtk_tree_path_free( last_row );
+        }
+    }
+}
+
+/****
+*****
+****/
 
 static void
@@ -60 +110 @@
     struct MsgData * data = gdata;
     const int level = gtr_combo_box_get_active_enum( combo_box );
+    const gboolean pinned_to_new = is_pinned_to_new( data );
 
     tr_setMessageLevel( level );
@@ -65 +116 @@
     data->maxLevel = level;
     gtk_tree_model_filter_refilter( GTK_TREE_MODEL_FILTER( data->filter ) );
+
+    if( pinned_to_new )
+        scroll_to_bottom( data );
 }
 
@@ -287 +341 @@
 
 static gboolean
-isRowVisible( GtkTreeModel * model,
-              GtkTreeIter *  iter,
-              gpointer       gdata )
+isRowVisible( GtkTreeModel * model, GtkTreeIter * iter, gpointer gdata )
 {
     const struct MsgData *     data = gdata;
@@ -299 +351 @@
 
 static void
-onWindowDestroyed( gpointer             gdata,
-                   GObject * deadWindow UNUSED )
+onWindowDestroyed( gpointer gdata, GObject * deadWindow UNUSED )
 {
     struct MsgData * data = gdata;
@@ -309 +360 @@
 
 static tr_msg_list *
-addMessages( GtkListStore *       store,
-             struct tr_msg_list * head )
-{
-    const char *        default_name = g_get_application_name( );
-    static unsigned int sequence = 1;
-    tr_msg_list *       i;
-
-    for( i = head; i; i = i->next )
-    {
-        GtkTreeIter unused;
-
-        gtk_list_store_insert_with_values( store, &unused, 0,
+addMessages( GtkListStore * store, struct tr_msg_list * head )
+{
+    tr_msg_list * i;
+    static unsigned int sequence = 0;
+    const char * default_name = g_get_application_name( );
+
+    for( i=head; i && i->next; i=i->next )
+    {
+        const char * name = i->name ? i->name : default_name;
+
+        gtk_list_store_insert_with_values( store, NULL, 0,
                                            COL_TR_MSG, i,
-                                           COL_NAME,
-                                           ( i->name ? i->name :
-                                             default_name ),
+                                           COL_NAME, name,
                                            COL_MESSAGE, i->message,
-                                           COL_SEQUENCE, sequence++,
+                                           COL_SEQUENCE, ++sequence,
                                            -1 );
-
-        if( !i->next )
-            break;
     }
 
@@ -340 +385 @@
 {
     struct MsgData * data = gdata;
+    const gboolean pinned_to_new = is_pinned_to_new( data );
 
     if( !data->isPaused )
@@ -355 +401 @@
             myTail = tail;
         }
-    }
+
+        if( pinned_to_new )
+            scroll_to_bottom( data );
+    }
+        
     return TRUE;
 }
@@ -484 +534 @@
     g_object_weak_ref( G_OBJECT( win ), onWindowDestroyed, data );
 
+    scroll_to_bottom( data );
     gtk_widget_show_all( win );
     return win;