AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-12 21:40:19 +00:00
Code Issues Projects Releases Wiki Activity

Another fix for #164884.

Browse Source 
2006-07-18  Kristian Rietveld  <kris@imendio.com>

	Another fix for #164884.

	* gtk/gtktreeprivate.h: add in_grab field.

	* gtk/gtktreeview.c (gtk_tree_view_button_press): only save press
	to possibly begin a drag when there's no grab pending,
	(gtk_tree_view_grab_notify): toggle in_grab field.
This commit is contained in:
Kristian Rietveld 2006-07-18 12:33:25 +00:00 committed by Kristian Rietveld
parent 6ca1b1e685
commit 61f4d77d55
4 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2006-07-18 Kristian Rietveld <kris@imendio.com>
Another fix for #164884.
* gtk/gtktreeprivate.h: add in_grab field.
* gtk/gtktreeview.c (gtk_tree_view_button_press): only save press
to possibly begin a drag when there's no grab pending,
(gtk_tree_view_grab_notify): toggle in_grab field.
2006-07-18 Kristian Rietveld <kris@imendio.com> 2006-07-18 Kristian Rietveld <kris@imendio.com>
* gtk/gtktreeview.c (gtk_tree_view_realize): use MAX * gtk/gtktreeview.c (gtk_tree_view_realize): use MAX

10
ChangeLog.pre-2-10
View File

@ -1,3 +1,13 @@
2006-07-18 Kristian Rietveld <kris@imendio.com>
Another fix for #164884.
* gtk/gtktreeprivate.h: add in_grab field.
* gtk/gtktreeview.c (gtk_tree_view_button_press): only save press
to possibly begin a drag when there's no grab pending,
(gtk_tree_view_grab_notify): toggle in_grab field.
2006-07-18 Kristian Rietveld <kris@imendio.com> 2006-07-18 Kristian Rietveld <kris@imendio.com>
* gtk/gtktreeview.c (gtk_tree_view_realize): use MAX * gtk/gtktreeview.c (gtk_tree_view_realize): use MAX

2
gtk/gtktreeprivate.h
View File

@ -231,6 +231,8 @@ struct _GtkTreeViewPrivate
guint rubber_banding_enable : 1; guint rubber_banding_enable : 1;
guint in_grab : 1;
/* Auto expand/collapse timeout in hover mode */ /* Auto expand/collapse timeout in hover mode */
guint auto_expand_timeout; guint auto_expand_timeout;

3
gtk/gtktreeview.c
View File

@ -2613,6 +2613,7 @@ gtk_tree_view_button_press (GtkWidget *widget,
/* Save press to possibly begin a drag /* Save press to possibly begin a drag
*/ */
if (!column_handled_click && if (!column_handled_click &&
!tree_view->priv->in_grab &&
tree_view->priv->pressed_button < 0) tree_view->priv->pressed_button < 0)
{ {
tree_view->priv->pressed_button = event->button; tree_view->priv->pressed_button = event->button;
@ -14513,6 +14514,8 @@ gtk_tree_view_grab_notify (GtkWidget *widget,
{ {
GtkTreeView *tree_view = GTK_TREE_VIEW (widget); GtkTreeView *tree_view = GTK_TREE_VIEW (widget);
tree_view->priv->in_grab = !was_grabbed;
if (!was_grabbed) if (!was_grabbed)
tree_view->priv->pressed_button = -1; tree_view->priv->pressed_button = -1;
} }