callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix for #50317

Browse Source 
2001-09-25  Havoc Pennington  <hp@redhat.com>

	* gtk/gtktextview.c: fix for #50317
This commit is contained in:
Havoc Pennington 2001-09-25 23:35:06 +00:00 committed by Havoc Pennington
parent 1a26412db8
commit be6ae47ad2
10 changed files with 51 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,8 +1,12 @@
2001-09-25 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c: fix for #50317
2001-09-25 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_key_press_event): use
gtk_text_iter_can_insert
* gtk/gtktextbuffer.c: use gtk_text_iter_can_insert
* gtk/gtktextiter.c (find_line_log_attrs): fixes, #57611, #57613

6
ChangeLog.pre-2-0
View File

@ -1,8 +1,12 @@
2001-09-25 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c: fix for #50317
2001-09-25 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_key_press_event): use
gtk_text_iter_can_insert
* gtk/gtktextbuffer.c: use gtk_text_iter_can_insert
* gtk/gtktextiter.c (find_line_log_attrs): fixes, #57611, #57613

6
ChangeLog.pre-2-10
View File

@ -1,8 +1,12 @@
2001-09-25 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c: fix for #50317
2001-09-25 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_key_press_event): use
gtk_text_iter_can_insert
* gtk/gtktextbuffer.c: use gtk_text_iter_can_insert
* gtk/gtktextiter.c (find_line_log_attrs): fixes, #57611, #57613

6
ChangeLog.pre-2-2
View File

@ -1,8 +1,12 @@
2001-09-25 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c: fix for #50317
2001-09-25 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_key_press_event): use
gtk_text_iter_can_insert
* gtk/gtktextbuffer.c: use gtk_text_iter_can_insert
* gtk/gtktextiter.c (find_line_log_attrs): fixes, #57611, #57613

6
ChangeLog.pre-2-4
View File

@ -1,8 +1,12 @@
2001-09-25 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c: fix for #50317
2001-09-25 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_key_press_event): use
gtk_text_iter_can_insert
* gtk/gtktextbuffer.c: use gtk_text_iter_can_insert
* gtk/gtktextiter.c (find_line_log_attrs): fixes, #57611, #57613

6
ChangeLog.pre-2-6
View File

@ -1,8 +1,12 @@
2001-09-25 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c: fix for #50317
2001-09-25 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_key_press_event): use
gtk_text_iter_can_insert
* gtk/gtktextbuffer.c: use gtk_text_iter_can_insert
* gtk/gtktextiter.c (find_line_log_attrs): fixes, #57611, #57613

6
ChangeLog.pre-2-8
View File

@ -1,8 +1,12 @@
2001-09-25 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c: fix for #50317
2001-09-25 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_key_press_event): use
gtk_text_iter_can_insert
* gtk/gtktextbuffer.c: use gtk_text_iter_can_insert
* gtk/gtktextiter.c (find_line_log_attrs): fixes, #57611, #57613

2
gtk/gtktextiter.c
View File

@ -2003,6 +2003,8 @@ _gtk_text_iter_forward_indexable_segment (GtkTextIter *iter)
{
/* End of buffer */
g_assert (!_gtk_text_line_is_last (real->line, real->tree));
g_assert (_gtk_text_line_contains_end_iter (real->line, real->tree));
g_assert (gtk_text_iter_is_end (iter));
check_invariants (iter);

17
gtk/gtktextview.c
View File

@ -980,6 +980,8 @@ gtk_text_view_init (GtkTextView *text_view)
text_view->drag_start_x = -1;
text_view->drag_start_y = -1;
text_view->pending_place_cursor_button = 0;
}
/**
@ -3346,6 +3348,7 @@ gtk_text_view_button_press_event (GtkWidget *widget, GdkEventButton *event)
{
text_view->drag_start_x = event->x;
text_view->drag_start_y = event->y;
text_view->pending_place_cursor_button = event->button;
}
else
{
@ -3465,12 +3468,13 @@ gtk_text_view_button_release_event (GtkWidget *widget, GdkEventButton *event)
text_view->just_selected_element = FALSE;
return FALSE;
}
else
else if (text_view->pending_place_cursor_button == event->button)
{
GtkTextIter iter;
/* Unselect everything; probably we were dragging, or clicked
* without dragging to remove selection.
/* Unselect everything; we clicked inside selection, but
* didn't move by the drag threshold, so just clear selection
* and place cursor.
*/
gtk_text_layout_get_iter_at_pixel (text_view->layout,
&iter,
@ -3478,7 +3482,9 @@ gtk_text_view_button_release_event (GtkWidget *widget, GdkEventButton *event)
event->y + text_view->yoffset);
gtk_text_buffer_place_cursor (get_buffer (text_view), &iter);
text_view->pending_place_cursor_button = 0;
return FALSE;
}
}
@ -4680,7 +4686,8 @@ gtk_text_view_start_selection_dnd (GtkTextView *text_view,
text_view->drag_start_x = -1;
text_view->drag_start_y = -1;
text_view->pending_place_cursor_button = 0;
target_list = gtk_target_list_new (target_table,
G_N_ELEMENTS (target_table));

2
gtk/gtktextview.h
View File

@ -143,6 +143,8 @@ struct _GtkTextView
GtkTextPendingScroll *pending_scroll;
GdkGC *cursor_gc;
gint pending_place_cursor_button;
};
struct _GtkTextViewClass