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

Make the column drag code a bit more robust (still scary, though).

Browse Source 
Sat Aug  7 01:26:08 2004  Matthias Clasen  <maclas@gmx.de>

	Make the column drag code a bit more robust (still scary,
	though).  (#106992, Christian Biere)

	* gtk/gtktreeview.c (_gtk_tree_view_column_start_drag): Assert
	that cur_reorder is NULL here.

	* gtk/gtktreeview.c (gtk_tree_view_button_release_drag_column):
	Reset cur_reorder to NULL, and only hide drag_highlight_window
	if it exists.
This commit is contained in:
Matthias Clasen 2004-08-07 05:28:43 +00:00 committed by Matthias Clasen
parent bbd78cd9a0
commit f62365d27c
5 changed files with 52 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
Sat Aug 7 01:26:08 2004 Matthias Clasen <maclas@gmx.de>
Make the column drag code a bit more robust (still scary,
though). (#106992, Christian Biere)
* gtk/gtktreeview.c (_gtk_tree_view_column_start_drag): Assert
that cur_reorder is NULL here.
* gtk/gtktreeview.c (gtk_tree_view_button_release_drag_column):
Reset cur_reorder to NULL, and only hide drag_highlight_window
if it exists.
2004-08-06 Federico Mena Quintero <federico@ximian.com> 2004-08-06 Federico Mena Quintero <federico@ximian.com>
Fix #144232: Fix #144232:

12
ChangeLog.pre-2-10
View File

@ -1,3 +1,15 @@
Sat Aug 7 01:26:08 2004 Matthias Clasen <maclas@gmx.de>
Make the column drag code a bit more robust (still scary,
though). (#106992, Christian Biere)
* gtk/gtktreeview.c (_gtk_tree_view_column_start_drag): Assert
that cur_reorder is NULL here.
* gtk/gtktreeview.c (gtk_tree_view_button_release_drag_column):
Reset cur_reorder to NULL, and only hide drag_highlight_window
if it exists.
2004-08-06 Federico Mena Quintero <federico@ximian.com> 2004-08-06 Federico Mena Quintero <federico@ximian.com>
Fix #144232: Fix #144232:

12
ChangeLog.pre-2-6
View File

@ -1,3 +1,15 @@
Sat Aug 7 01:26:08 2004 Matthias Clasen <maclas@gmx.de>
Make the column drag code a bit more robust (still scary,
though). (#106992, Christian Biere)
* gtk/gtktreeview.c (_gtk_tree_view_column_start_drag): Assert
that cur_reorder is NULL here.
* gtk/gtktreeview.c (gtk_tree_view_button_release_drag_column):
Reset cur_reorder to NULL, and only hide drag_highlight_window
if it exists.
2004-08-06 Federico Mena Quintero <federico@ximian.com> 2004-08-06 Federico Mena Quintero <federico@ximian.com>
Fix #144232: Fix #144232:

12
ChangeLog.pre-2-8
View File

@ -1,3 +1,15 @@
Sat Aug 7 01:26:08 2004 Matthias Clasen <maclas@gmx.de>
Make the column drag code a bit more robust (still scary,
though). (#106992, Christian Biere)
* gtk/gtktreeview.c (_gtk_tree_view_column_start_drag): Assert
that cur_reorder is NULL here.
* gtk/gtktreeview.c (gtk_tree_view_button_release_drag_column):
Reset cur_reorder to NULL, and only hide drag_highlight_window
if it exists.
2004-08-06 Federico Mena Quintero <federico@ximian.com> 2004-08-06 Federico Mena Quintero <federico@ximian.com>
Fix #144232: Fix #144232:

6
gtk/gtktreeview.c
View File

@ -2559,8 +2559,10 @@ gtk_tree_view_button_release_drag_column (GtkWidget *widget,
g_list_foreach (tree_view->priv->column_drag_info, (GFunc) g_free, NULL); g_list_foreach (tree_view->priv->column_drag_info, (GFunc) g_free, NULL);
g_list_free (tree_view->priv->column_drag_info); g_list_free (tree_view->priv->column_drag_info);
tree_view->priv->column_drag_info = NULL; tree_view->priv->column_drag_info = NULL;
tree_view->priv->cur_reorder = NULL;
gdk_window_hide (tree_view->priv->drag_highlight_window); if (tree_view->priv->drag_highlight_window)
gdk_window_hide (tree_view->priv->drag_highlight_window);
/* Reset our flags */ /* Reset our flags */
tree_view->priv->drag_column_window_state = DRAG_COLUMN_WINDOW_STATE_UNSET; tree_view->priv->drag_column_window_state = DRAG_COLUMN_WINDOW_STATE_UNSET;
@ -8049,6 +8051,7 @@ _gtk_tree_view_column_start_drag (GtkTreeView *tree_view,
GdkDisplay *display = gdk_screen_get_display (screen); GdkDisplay *display = gdk_screen_get_display (screen);
g_return_if_fail (tree_view->priv->column_drag_info == NULL); g_return_if_fail (tree_view->priv->column_drag_info == NULL);
g_return_if_fail (tree_view->priv->cur_reorder == NULL);
gtk_tree_view_set_column_drag_info (tree_view, column); gtk_tree_view_set_column_drag_info (tree_view, column);
@ -8141,7 +8144,6 @@ _gtk_tree_view_column_start_drag (GtkTreeView *tree_view,
gdk_keyboard_grab (tree_view->priv->drag_window, gdk_keyboard_grab (tree_view->priv->drag_window,
FALSE, FALSE,
GDK_CURRENT_TIME); GDK_CURRENT_TIME);
} }
static void static void