Commit 19c5e80c authored by Jonathan Blandford's avatar Jonathan Blandford Committed by Jonathan Blandford

only resize the window.

Fri Jan 18 16:31:21 2002  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreeview.c (gtk_tree_view_size_allocate): only resize the
	window.
parent 382cc811
Fri Jan 18 16:31:21 2002 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): only resize the
window.
Mon Jan 21 11:56:31 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_real_activate): Trap the
......
Fri Jan 18 16:31:21 2002 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): only resize the
window.
Mon Jan 21 11:56:31 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_real_activate): Trap the
......
Fri Jan 18 16:31:21 2002 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): only resize the
window.
Mon Jan 21 11:56:31 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_real_activate): Trap the
......
Fri Jan 18 16:31:21 2002 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): only resize the
window.
Mon Jan 21 11:56:31 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_real_activate): Trap the
......
Fri Jan 18 16:31:21 2002 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): only resize the
window.
Mon Jan 21 11:56:31 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_real_activate): Trap the
......
Fri Jan 18 16:31:21 2002 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): only resize the
window.
Mon Jan 21 11:56:31 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_real_activate): Trap the
......
Fri Jan 18 16:31:21 2002 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): only resize the
window.
Mon Jan 21 11:56:31 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_real_activate): Trap the
......
......@@ -1581,10 +1581,9 @@ gtk_tree_view_size_allocate (GtkWidget *widget,
gdk_window_resize (tree_view->priv->header_window,
MAX (tree_view->priv->width, allocation->width),
tree_view->priv->header_height);
gdk_window_move_resize (tree_view->priv->bin_window,
0, TREE_VIEW_HEADER_HEIGHT (tree_view),
MAX (tree_view->priv->width, allocation->width),
allocation->height - TREE_VIEW_HEADER_HEIGHT (tree_view));
gdk_window_resize (tree_view->priv->bin_window,
MAX (tree_view->priv->width, allocation->width),
allocation->height - TREE_VIEW_HEADER_HEIGHT (tree_view));
}
gtk_tree_view_size_allocate_columns (widget);
......@@ -5757,6 +5756,7 @@ _gtk_tree_view_column_start_drag (GtkTreeView *tree_view,
gint x, y, width, height;
g_return_if_fail (tree_view->priv->column_drag_info == NULL);
g_print ("start drag!\n");
gtk_tree_view_set_column_drag_info (tree_view, column);
......
......@@ -92,8 +92,6 @@ static void gtk_tree_view_column_update_button (GtkTreeViewColum
static gint gtk_tree_view_column_button_event (GtkWidget *widget,
GdkEvent *event,
gpointer data);
static void gtk_tree_view_column_button_realize (GtkWidget *widget,
gpointer data);
static void gtk_tree_view_column_button_clicked (GtkWidget *widget,
gpointer data);
......@@ -530,6 +528,7 @@ gtk_tree_view_column_create_button (GtkTreeViewColumn *tree_column)
gtk_widget_push_composite_child ();
tree_column->button = gtk_button_new ();
gtk_widget_add_events (tree_column->button, GDK_POINTER_MOTION_MASK);
gtk_widget_pop_composite_child ();
/* make sure we own a reference to it as well. */
......@@ -537,10 +536,6 @@ gtk_tree_view_column_create_button (GtkTreeViewColumn *tree_column)
gtk_widget_set_parent_window (tree_column->button, tree_view->priv->header_window);
gtk_widget_set_parent (tree_column->button, GTK_WIDGET (tree_view));
gtk_signal_connect (GTK_OBJECT (tree_column->button), "realize",
(GtkSignalFunc) gtk_tree_view_column_button_realize,
NULL);
gtk_signal_connect (GTK_OBJECT (tree_column->button), "event",
(GtkSignalFunc) gtk_tree_view_column_button_event,
(gpointer) tree_column);
......@@ -743,9 +738,12 @@ gtk_tree_view_column_button_event (GtkWidget *widget,
g_return_val_if_fail (event != NULL, FALSE);
g_print ("event->type: %d\ncolumn->reorderable: %d\n", event->type, column->reorderable);
if (event->type == GDK_BUTTON_PRESS &&
column->reorderable)
{
g_print ("setting maybe_reordered\n");
column->maybe_reordered = TRUE;
gdk_window_get_pointer (widget->window,
&column->drag_x,
......@@ -758,6 +756,13 @@ gtk_tree_view_column_button_event (GtkWidget *widget,
column->maybe_reordered)
column->maybe_reordered = FALSE;
if (event->type == GDK_MOTION_NOTIFY &&
(column->maybe_reordered))
{
g_print ("motion:\n");
}
if (event->type == GDK_MOTION_NOTIFY &&
(column->maybe_reordered) &&
(gtk_drag_check_threshold (widget,
......@@ -789,11 +794,6 @@ gtk_tree_view_column_button_event (GtkWidget *widget,
return FALSE;
}
static void
gtk_tree_view_column_button_realize (GtkWidget *widget, gpointer data)
{
gdk_window_set_events (widget->window, gdk_window_get_events (widget->window) | GDK_POINTER_MOTION_MASK);
}
static void
gtk_tree_view_column_button_clicked (GtkWidget *widget, gpointer data)
......
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