Make drag reordering work properly for columns other than the first.

2005-09-09  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_event):
	Make drag reordering work properly for columns other than the
	first.  (#315054, Dan Winship)
This commit is contained in:
Matthias Clasen 2005-09-09 21:21:12 +00:00 committed by Matthias Clasen
parent 277a6f4701
commit e42a880493
3 changed files with 13 additions and 5 deletions

View File

@ -1,3 +1,9 @@
2005-09-09 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_event):
Make drag reordering work properly for columns other than the
first. (#315054, Dan Winship)
* gtk/gtkfontsel.c (gtk_font_selection_set_font_name): Handle * gtk/gtkfontsel.c (gtk_font_selection_set_font_name): Handle
invalid fontnames better. (#136926, Michael R. Walton) invalid fontnames better. (#136926, Michael R. Walton)

View File

@ -1,3 +1,9 @@
2005-09-09 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_event):
Make drag reordering work properly for columns other than the
first. (#315054, Dan Winship)
* gtk/gtkfontsel.c (gtk_font_selection_set_font_name): Handle * gtk/gtkfontsel.c (gtk_font_selection_set_font_name): Handle
invalid fontnames better. (#136926, Michael R. Walton) invalid fontnames better. (#136926, Michael R. Walton)

View File

@ -1053,7 +1053,7 @@ gtk_tree_view_column_button_event (GtkWidget *widget,
((GdkEventButton *)event)->button == 1) ((GdkEventButton *)event)->button == 1)
{ {
column->maybe_reordered = TRUE; column->maybe_reordered = TRUE;
gdk_window_get_pointer (widget->window, gdk_window_get_pointer (GTK_BUTTON (widget)->event_window,
&column->drag_x, &column->drag_x,
&column->drag_y, &column->drag_y,
NULL); NULL);
@ -1073,10 +1073,6 @@ gtk_tree_view_column_button_event (GtkWidget *widget,
(gint) ((GdkEventMotion *)event)->y))) (gint) ((GdkEventMotion *)event)->y)))
{ {
column->maybe_reordered = FALSE; column->maybe_reordered = FALSE;
/* this is to change our drag_x to be relative to
* tree_view->priv->bin_window, instead of our window.
*/
column->drag_x -= column->button->allocation.x;
_gtk_tree_view_column_start_drag (GTK_TREE_VIEW (column->tree_view), column); _gtk_tree_view_column_start_drag (GTK_TREE_VIEW (column->tree_view), column);
return TRUE; return TRUE;
} }