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

Don't ever go unconditionally to the buffer ends; that doesn't work if the

Browse Source 
2005-07-11  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktextview.c (gtk_text_view_move_cursor_internal): Don't
	ever go unconditionally to the buffer ends; that doesn't work
	if the initial or final portion of the buffer are invisible.
This commit is contained in:
Matthias Clasen 2005-07-11 19:46:43 +00:00 committed by Matthias Clasen
parent 78c52d7141
commit eac5b1561f
4 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2005-07-11 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktextview.c (gtk_text_view_move_cursor_internal): Don't
ever go unconditionally to the buffer ends; that doesn't work
if the initial or final portion of the buffer are invisible.
2005-07-11 Kristian Rietveld <kris@gtk.org> 2005-07-11 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (gtk_tree_view_class_init): add binding entry * gtk/gtktreeview.c (gtk_tree_view_class_init): add binding entry

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
2005-07-11 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktextview.c (gtk_text_view_move_cursor_internal): Don't
ever go unconditionally to the buffer ends; that doesn't work
if the initial or final portion of the buffer are invisible.
2005-07-11 Kristian Rietveld <kris@gtk.org> 2005-07-11 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (gtk_tree_view_class_init): add binding entry * gtk/gtktreeview.c (gtk_tree_view_class_init): add binding entry

6
ChangeLog.pre-2-8
View File

@ -1,3 +1,9 @@
2005-07-11 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktextview.c (gtk_text_view_move_cursor_internal): Don't
ever go unconditionally to the buffer ends; that doesn't work
if the initial or final portion of the buffer are invisible.
2005-07-11 Kristian Rietveld <kris@gtk.org> 2005-07-11 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (gtk_tree_view_class_init): add binding entry * gtk/gtktreeview.c (gtk_tree_view_class_init): add binding entry

12
gtk/gtktextview.c
View File

@ -1,4 +1,3 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* GTK - The GIMP Toolkit /* GTK - The GIMP Toolkit
* gtktextview.c Copyright (C) 2000 Red Hat, Inc. * gtktextview.c Copyright (C) 2000 Red Hat, Inc.
* *
@ -4720,7 +4719,7 @@ gtk_text_view_move_cursor_internal (GtkTextView *text_view,
else if (count > 0) else if (count > 0)
{ {
if (!gtk_text_iter_forward_visible_word_ends (&newplace, count)) if (!gtk_text_iter_forward_visible_word_ends (&newplace, count))
gtk_text_iter_forward_to_end (&newplace); gtk_text_iter_forward_to_line_end (&newplace);
} }
break; break;
@ -4730,15 +4729,14 @@ gtk_text_view_move_cursor_internal (GtkTextView *text_view,
if (gtk_text_view_move_iter_by_lines (text_view, &newplace, count)) if (gtk_text_view_move_iter_by_lines (text_view, &newplace, count))
gtk_text_layout_move_iter_to_x (text_view->layout, &newplace, cursor_x_pos); gtk_text_layout_move_iter_to_x (text_view->layout, &newplace, cursor_x_pos);
else else
/* we currently do not have a backward_to_start, use offset */ gtk_text_iter_set_line_offset (&newplace, 0);
gtk_text_iter_set_offset (&newplace, 0);
} }
if (count > 0) if (count > 0)
{ {
if (gtk_text_view_move_iter_by_lines (text_view, &newplace, count)) if (gtk_text_view_move_iter_by_lines (text_view, &newplace, count))
gtk_text_layout_move_iter_to_x (text_view->layout, &newplace, cursor_x_pos); gtk_text_layout_move_iter_to_x (text_view->layout, &newplace, cursor_x_pos);
else else
gtk_text_iter_forward_to_end (&newplace); gtk_text_iter_forward_to_line_end (&newplace);
} }
break; break;
@ -4808,9 +4806,7 @@ gtk_text_view_move_cursor_internal (GtkTextView *text_view,
"insert")); "insert"));
if (step == GTK_MOVEMENT_DISPLAY_LINES) if (step == GTK_MOVEMENT_DISPLAY_LINES)
{ gtk_text_view_set_virtual_cursor_pos (text_view, cursor_x_pos, -1);
gtk_text_view_set_virtual_cursor_pos (text_view, cursor_x_pos, -1);
}
} }
gtk_text_view_pend_cursor_blink (text_view); gtk_text_view_pend_cursor_blink (text_view);