AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

textview: Don't scroll for pastes in another view

Browse Source 
GtkTextView scrolls to the insertion point when the text
buffer signals a paste is done. This is wrong when there
are multiple views on the same buffer, and the paste
happened in another view.

To fix this, flip the handling of the scroll_after_paste
boolean to only be TRUE if we know that we want to scroll.
This commit is contained in:
Matthias Clasen 2018-05-14 13:03:34 +01:00
parent 0caa3dbccf
commit f2868f5cf3
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/gtktextview.c
View File

@ -1728,7 +1728,7 @@ gtk_text_view_init (GtkTextView *text_view)
priv->tabs = NULL;
priv->editable = TRUE;
priv->scroll_after_paste = TRUE;
priv->scroll_after_paste = FALSE;
gtk_drag_dest_set (widget, 0, NULL, 0,
GDK_ACTION_COPY | GDK_ACTION_MOVE);
@ -5666,10 +5666,6 @@ gtk_text_view_multipress_gesture_pressed (GtkGestureMultiPress *gesture,
else if (button == GDK_BUTTON_MIDDLE &&
get_middle_click_paste (text_view))
{
/* We do not want to scroll back to the insert iter when we paste
with the middle button */
priv->scroll_after_paste = FALSE;
get_iter_from_gesture (text_view, priv->multipress_gesture,
&iter, NULL, NULL);
gtk_text_buffer_paste_clipboard (get_buffer (text_view),
@ -7217,6 +7213,8 @@ gtk_text_view_paste_clipboard (GtkTextView *text_view)
GtkClipboard *clipboard = gtk_widget_get_clipboard (GTK_WIDGET (text_view),
GDK_SELECTION_CLIPBOARD);
text_view->priv->scroll_after_paste = TRUE;
gtk_text_buffer_paste_clipboard (get_buffer (text_view),
clipboard,
NULL,
@ -7239,7 +7237,7 @@ gtk_text_view_paste_done_handler (GtkTextBuffer *buffer,
gtk_text_view_scroll_mark_onscreen (text_view, gtk_text_buffer_get_insert (buffer));
}
priv->scroll_after_paste = TRUE;
priv->scroll_after_paste = FALSE;
}
static void