Commit f62365d2 authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen

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

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.
parent bbd78cd9
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>
Fix #144232:
......
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>
Fix #144232:
......
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>
Fix #144232:
......
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>
Fix #144232:
......
......@@ -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_free (tree_view->priv->column_drag_info);
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 */
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);
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);
......@@ -8141,7 +8144,6 @@ _gtk_tree_view_column_start_drag (GtkTreeView *tree_view,
gdk_keyboard_grab (tree_view->priv->drag_window,
FALSE,
GDK_CURRENT_TIME);
}
static void
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment