From 1a7c0ed0996997fc45cbd71ea4eb6809b11ed89f Mon Sep 17 00:00:00 2001 From: Paolo Borelli Date: Mon, 12 Jan 2009 17:07:35 +0000 Subject: =?UTF-8?q?Bug=20492794=20=E2=80=93=20Pasting=20external=20text=20?= =?UTF-8?q?at=20end=20of=20view=20yields=20wrong=20scrolling?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2009-01-12 Paolo Borelli Bug 492794 – Pasting external text at end of view yields wrong scrolling to mark * gtk/gtktextbuffer.[ch]: * gtk/gtktextview.c: Add a "paste-done" signal and use it to propelry scroll the view at the end of the pasted text in the case of an async paste. Patch by Ignacio Casal Quintero based on a patch by Yevgen Muntyan. svn path=/trunk/; revision=22100 --- gtk/gtktextbuffer.c | 42 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-) (limited to 'gtk/gtktextbuffer.c') diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c index 69a30aece3..8ce3b38a5b 100644 --- a/gtk/gtktextbuffer.c +++ b/gtk/gtktextbuffer.c @@ -83,6 +83,7 @@ enum { REMOVE_TAG, BEGIN_USER_ACTION, END_USER_ACTION, + PASTE_DONE, LAST_SIGNAL }; @@ -581,6 +582,27 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass) G_TYPE_NONE, 0); + /** + * GtkTextBuffer::paste-done: + * @textbuffer: the object which received the signal + * + * The paste-done signal is emitted after paste operation has been completed. + * This is useful to properly scroll the view to the end of the pasted text. + * See gtk_text_buffer_paste_clipboard() for more details. + * + * Since: 2.16 + */ + signals[PASTE_DONE] = + g_signal_new (I_("paste_done"), + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkTextBufferClass, paste_done), + NULL, NULL, + _gtk_marshal_VOID__OBJECT, + G_TYPE_NONE, + 1, + GTK_TYPE_CLIPBOARD); + g_type_class_add_private (object_class, sizeof (GtkTextBufferPrivate)); } @@ -3301,6 +3323,13 @@ post_paste_cleanup (ClipboardRequest *request_data) } } +static void +emit_paste_done (GtkTextBuffer *buffer, + GtkClipboard *clipboard) +{ + g_signal_emit (buffer, signals[PASTE_DONE], 0, clipboard); +} + static void free_clipboard_request (ClipboardRequest *request_data) { @@ -3338,6 +3367,8 @@ clipboard_text_received (GtkClipboard *clipboard, if (request_data->interactive) gtk_text_buffer_end_user_action (buffer); + + emit_paste_done (buffer, clipboard); } free_clipboard_request (request_data); @@ -3448,6 +3479,8 @@ clipboard_rich_text_received (GtkClipboard *clipboard, if (request_data->interactive) gtk_text_buffer_end_user_action (request_data->buffer); + emit_paste_done (request_data->buffer, clipboard); + if (retval) { post_paste_cleanup (request_data); @@ -3462,7 +3495,8 @@ clipboard_rich_text_received (GtkClipboard *clipboard, } static void -paste_from_buffer (ClipboardRequest *request_data, +paste_from_buffer (GtkClipboard *clipboard, + ClipboardRequest *request_data, GtkTextBuffer *src_buffer, const GtkTextIter *start, const GtkTextIter *end) @@ -3495,6 +3529,8 @@ paste_from_buffer (ClipboardRequest *request_data, if (request_data->interactive) gtk_text_buffer_end_user_action (buffer); + emit_paste_done (buffer, clipboard); + g_object_unref (src_buffer); free_clipboard_request (request_data); @@ -3518,13 +3554,13 @@ clipboard_clipboard_buffer_received (GtkClipboard *clipboard, { gtk_text_buffer_get_bounds (src_buffer, &start, &end); - paste_from_buffer (request_data, src_buffer, + paste_from_buffer (clipboard, request_data, src_buffer, &start, &end); } else { if (gtk_text_buffer_get_selection_bounds (src_buffer, &start, &end)) - paste_from_buffer (request_data, src_buffer, + paste_from_buffer (clipboard, request_data, src_buffer, &start, &end); } } -- cgit v1.2.1