changeset 10797:5335eb2b8b95

[gaim-migrate @ 12440] lets change how scrolling to end works. for the most part, you shouldn't notice any changes. However, there were some cases, especially with the history plugin, where we should have scrolled to the bottom but didn't. We should now. Let me know if we don't. committer: Tailor Script <tailor@pidgin.im>
author Tim Ringenbach <marv@pidgin.im>
date Fri, 08 Apr 2005 20:47:19 +0000
parents a8e84a45db3e
children 08981462ebbb
files src/gtkimhtml.c src/gtkimhtml.h
diffstat 2 files changed, 13 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/src/gtkimhtml.c	Fri Apr 08 19:08:37 2005 +0000
+++ b/src/gtkimhtml.c	Fri Apr 08 20:47:19 2005 +0000
@@ -1188,7 +1188,6 @@
 	GtkTextIter iter;
 	imhtml->text_buffer = gtk_text_buffer_new(NULL);
 	gtk_text_buffer_get_end_iter (imhtml->text_buffer, &iter);
-	imhtml->scrollpoint = gtk_text_buffer_create_mark(imhtml->text_buffer, NULL, &iter, FALSE);
 	gtk_text_view_set_buffer(GTK_TEXT_VIEW(imhtml), imhtml->text_buffer);
 	gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(imhtml), GTK_WRAP_WORD_CHAR);
 	gtk_text_view_set_pixels_below_lines(GTK_TEXT_VIEW(imhtml), 5);
@@ -2166,20 +2165,21 @@
 	}
 }
 
+gboolean scroll_idle_cb(gpointer data)
+{
+	GtkTextView *imhtml = data;
+	GtkAdjustment *adj;
+
+	gaim_debug_info("gtkimhtml", "in scroll_idle_cb\n");
+	adj = GTK_TEXT_VIEW(imhtml)->vadjustment;
+	gtk_adjustment_set_value(adj, adj->upper - adj->page_size);
+
+	return FALSE;
+}
+
 void gtk_imhtml_scroll_to_end(GtkIMHtml *imhtml)
 {
-	GtkTextIter iter;
-	/* If this seems backwards at first glance, well it's not.
-	 * It means scroll such that the mark is closest to the top,
-	 * and closest to the right as possible. Remember kids, you have
-	 * to scroll left to move a given spot closest to the right,
-	 * and scroll down to move a spot closest to the top.
-	 */
-	gtk_text_buffer_get_end_iter(imhtml->text_buffer, &iter);
-	gtk_text_iter_set_line_offset(&iter, 0);
-	gtk_text_buffer_move_mark(imhtml->text_buffer, imhtml->scrollpoint, &iter);
-	gtk_text_view_scroll_to_mark(GTK_TEXT_VIEW(imhtml), imhtml->scrollpoint,
-	                             0, TRUE, 1.0, 0.0);
+	g_idle_add_full(GTK_TEXT_VIEW_PRIORITY_VALIDATE + 10, scroll_idle_cb, imhtml, NULL);
 }
 
 void gtk_imhtml_insert_html_at_iter(GtkIMHtml        *imhtml,
--- a/src/gtkimhtml.h	Fri Apr 08 19:08:37 2005 +0000
+++ b/src/gtkimhtml.h	Fri Apr 08 20:47:19 2005 +0000
@@ -75,7 +75,6 @@
 struct _GtkIMHtml {
 	GtkTextView text_view;
 	GtkTextBuffer *text_buffer;
-	GtkTextMark *scrollpoint;
 	GdkCursor *hand_cursor;
 	GdkCursor *arrow_cursor;
 	GdkCursor *text_cursor;