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

Move the call to gtk_text_view_end_selection_drag() from

Browse Source 
2006-03-28  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktextview.c (gtk_text_view_do_popup)
	(gtk_text_view_grab_notify): Move the call to
	gtk_text_view_end_selection_drag() from gtk_text_view_do_popup
	to gtk_text_view_grab_notify, so that it works not only
	for the text views own popup, but also for other ways in which
	we might become grab-shadowed during a selection drag.
	(#74620, Li Yuan)
This commit is contained in:
Matthias Clasen 2006-03-28 16:01:11 +00:00 committed by Matthias Clasen
parent b815740789
commit 97c07a14f3
3 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2006-03-28 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktextview.c (gtk_text_view_do_popup)
(gtk_text_view_grab_notify): Move the call to
gtk_text_view_end_selection_drag() from gtk_text_view_do_popup
to gtk_text_view_grab_notify, so that it works not only
for the text views own popup, but also for other ways in which
we might become grab-shadowed during a selection drag.
(#74620, Li Yuan)
2006-03-28 Sven Herzberg <herzi@gnome-de.org>
reviewed by: Tim Janik

10
ChangeLog.pre-2-10
View File

@ -1,3 +1,13 @@
2006-03-28 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktextview.c (gtk_text_view_do_popup)
(gtk_text_view_grab_notify): Move the call to
gtk_text_view_end_selection_drag() from gtk_text_view_do_popup
to gtk_text_view_grab_notify, so that it works not only
for the text views own popup, but also for other ways in which
we might become grab-shadowed during a selection drag.
(#74620, Li Yuan)
2006-03-28 Sven Herzberg <herzi@gnome-de.org>
reviewed by: Tim Janik

8
gtk/gtktextview.c
View File

@ -3720,7 +3720,10 @@ gtk_text_view_grab_notify (GtkWidget *widget,
gboolean was_grabbed)
{
if (!was_grabbed)
gtk_text_view_unobscure_mouse_cursor (GTK_TEXT_VIEW (widget));
{
gtk_text_view_end_selection_drag (GTK_TEXT_VIEW (widget), NULL);
gtk_text_view_unobscure_mouse_cursor (GTK_TEXT_VIEW (widget));
}
}
@ -7314,9 +7317,6 @@ gtk_text_view_do_popup (GtkTextView *text_view,
{
PopupInfo *info = g_new (PopupInfo, 1);
/* should not need this, see http://bugzilla.gnome.org/show_bug.cgi?id=74620 */
gtk_text_view_end_selection_drag (text_view, event);
/* In order to know what entries we should make sensitive, we
* ask for the current targets of the clipboard, and when
* we get them, then we actually pop up the menu.