Rename gtk_tree_view_queue_draw_node to _gtk_tree_view_queue_draw_node.

2002-01-03  Anders Carlsson  <andersca@gnu.org>

	* gtk/gtktreeview.c: Rename gtk_tree_view_queue_draw_node to
	_gtk_tree_view_queue_draw_node.
	(gtk_tree_view_row_has_child_toggled): Only redraw one node.

	* gtk/gtktreesortable.c (gtk_tree_sortable_set_sort_func):
	sort_column_id can be 0.

	* gtk/gtktreeselection.c (gtk_tree_selection_real_select_node):
	Only redraw one the node being selected.

	* gtk/gtktreeprivate.h: Add _gtk_tree_view_queue_draw_node.
This commit is contained in:
Anders Carlsson
2002-01-02 23:51:03 +00:00
committed by Anders Carlsson
parent bc879373a2
commit 88edb0e58e
11 changed files with 133 additions and 30 deletions

View File

@ -1,3 +1,17 @@
2002-01-03 Anders Carlsson <andersca@gnu.org>
* gtk/gtktreeview.c: Rename gtk_tree_view_queue_draw_node to
_gtk_tree_view_queue_draw_node.
(gtk_tree_view_row_has_child_toggled): Only redraw one node.
* gtk/gtktreesortable.c (gtk_tree_sortable_set_sort_func):
sort_column_id can be 0.
* gtk/gtktreeselection.c (gtk_tree_selection_real_select_node):
Only redraw one the node being selected.
* gtk/gtktreeprivate.h: Add _gtk_tree_view_queue_draw_node.
Wed Jan 2 23:09:06 2002 Tim Janik <timj@gtk.org> Wed Jan 2 23:09:06 2002 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c (_gtk_container_queue_resize): don't ignore * gtk/gtkcontainer.c (_gtk_container_queue_resize): don't ignore
@ -9,6 +23,7 @@ Wed Jan 2 23:09:06 2002 Tim Janik <timj@gtk.org>
* gtk/Makefile.am (LDFLAGS): automake still doesn't support * gtk/Makefile.am (LDFLAGS): automake still doesn't support
libsomething_la_LDFLAGS, so fix the build again libsomething_la_LDFLAGS, so fix the build again
2002-01-01 Havoc Pennington <hp@pobox.com> 2002-01-01 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c (gtk_text_view_expose_event): propagate * gtk/gtktextview.c (gtk_text_view_expose_event): propagate

View File

@ -1,3 +1,17 @@
2002-01-03 Anders Carlsson <andersca@gnu.org>
* gtk/gtktreeview.c: Rename gtk_tree_view_queue_draw_node to
_gtk_tree_view_queue_draw_node.
(gtk_tree_view_row_has_child_toggled): Only redraw one node.
* gtk/gtktreesortable.c (gtk_tree_sortable_set_sort_func):
sort_column_id can be 0.
* gtk/gtktreeselection.c (gtk_tree_selection_real_select_node):
Only redraw one the node being selected.
* gtk/gtktreeprivate.h: Add _gtk_tree_view_queue_draw_node.
Wed Jan 2 23:09:06 2002 Tim Janik <timj@gtk.org> Wed Jan 2 23:09:06 2002 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c (_gtk_container_queue_resize): don't ignore * gtk/gtkcontainer.c (_gtk_container_queue_resize): don't ignore
@ -9,6 +23,7 @@ Wed Jan 2 23:09:06 2002 Tim Janik <timj@gtk.org>
* gtk/Makefile.am (LDFLAGS): automake still doesn't support * gtk/Makefile.am (LDFLAGS): automake still doesn't support
libsomething_la_LDFLAGS, so fix the build again libsomething_la_LDFLAGS, so fix the build again
2002-01-01 Havoc Pennington <hp@pobox.com> 2002-01-01 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c (gtk_text_view_expose_event): propagate * gtk/gtktextview.c (gtk_text_view_expose_event): propagate

View File

@ -1,3 +1,17 @@
2002-01-03 Anders Carlsson <andersca@gnu.org>
* gtk/gtktreeview.c: Rename gtk_tree_view_queue_draw_node to
_gtk_tree_view_queue_draw_node.
(gtk_tree_view_row_has_child_toggled): Only redraw one node.
* gtk/gtktreesortable.c (gtk_tree_sortable_set_sort_func):
sort_column_id can be 0.
* gtk/gtktreeselection.c (gtk_tree_selection_real_select_node):
Only redraw one the node being selected.
* gtk/gtktreeprivate.h: Add _gtk_tree_view_queue_draw_node.
Wed Jan 2 23:09:06 2002 Tim Janik <timj@gtk.org> Wed Jan 2 23:09:06 2002 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c (_gtk_container_queue_resize): don't ignore * gtk/gtkcontainer.c (_gtk_container_queue_resize): don't ignore
@ -9,6 +23,7 @@ Wed Jan 2 23:09:06 2002 Tim Janik <timj@gtk.org>
* gtk/Makefile.am (LDFLAGS): automake still doesn't support * gtk/Makefile.am (LDFLAGS): automake still doesn't support
libsomething_la_LDFLAGS, so fix the build again libsomething_la_LDFLAGS, so fix the build again
2002-01-01 Havoc Pennington <hp@pobox.com> 2002-01-01 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c (gtk_text_view_expose_event): propagate * gtk/gtktextview.c (gtk_text_view_expose_event): propagate

View File

@ -1,3 +1,17 @@
2002-01-03 Anders Carlsson <andersca@gnu.org>
* gtk/gtktreeview.c: Rename gtk_tree_view_queue_draw_node to
_gtk_tree_view_queue_draw_node.
(gtk_tree_view_row_has_child_toggled): Only redraw one node.
* gtk/gtktreesortable.c (gtk_tree_sortable_set_sort_func):
sort_column_id can be 0.
* gtk/gtktreeselection.c (gtk_tree_selection_real_select_node):
Only redraw one the node being selected.
* gtk/gtktreeprivate.h: Add _gtk_tree_view_queue_draw_node.
Wed Jan 2 23:09:06 2002 Tim Janik <timj@gtk.org> Wed Jan 2 23:09:06 2002 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c (_gtk_container_queue_resize): don't ignore * gtk/gtkcontainer.c (_gtk_container_queue_resize): don't ignore
@ -9,6 +23,7 @@ Wed Jan 2 23:09:06 2002 Tim Janik <timj@gtk.org>
* gtk/Makefile.am (LDFLAGS): automake still doesn't support * gtk/Makefile.am (LDFLAGS): automake still doesn't support
libsomething_la_LDFLAGS, so fix the build again libsomething_la_LDFLAGS, so fix the build again
2002-01-01 Havoc Pennington <hp@pobox.com> 2002-01-01 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c (gtk_text_view_expose_event): propagate * gtk/gtktextview.c (gtk_text_view_expose_event): propagate

View File

@ -1,3 +1,17 @@
2002-01-03 Anders Carlsson <andersca@gnu.org>
* gtk/gtktreeview.c: Rename gtk_tree_view_queue_draw_node to
_gtk_tree_view_queue_draw_node.
(gtk_tree_view_row_has_child_toggled): Only redraw one node.
* gtk/gtktreesortable.c (gtk_tree_sortable_set_sort_func):
sort_column_id can be 0.
* gtk/gtktreeselection.c (gtk_tree_selection_real_select_node):
Only redraw one the node being selected.
* gtk/gtktreeprivate.h: Add _gtk_tree_view_queue_draw_node.
Wed Jan 2 23:09:06 2002 Tim Janik <timj@gtk.org> Wed Jan 2 23:09:06 2002 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c (_gtk_container_queue_resize): don't ignore * gtk/gtkcontainer.c (_gtk_container_queue_resize): don't ignore
@ -9,6 +23,7 @@ Wed Jan 2 23:09:06 2002 Tim Janik <timj@gtk.org>
* gtk/Makefile.am (LDFLAGS): automake still doesn't support * gtk/Makefile.am (LDFLAGS): automake still doesn't support
libsomething_la_LDFLAGS, so fix the build again libsomething_la_LDFLAGS, so fix the build again
2002-01-01 Havoc Pennington <hp@pobox.com> 2002-01-01 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c (gtk_text_view_expose_event): propagate * gtk/gtktextview.c (gtk_text_view_expose_event): propagate

View File

@ -1,3 +1,17 @@
2002-01-03 Anders Carlsson <andersca@gnu.org>
* gtk/gtktreeview.c: Rename gtk_tree_view_queue_draw_node to
_gtk_tree_view_queue_draw_node.
(gtk_tree_view_row_has_child_toggled): Only redraw one node.
* gtk/gtktreesortable.c (gtk_tree_sortable_set_sort_func):
sort_column_id can be 0.
* gtk/gtktreeselection.c (gtk_tree_selection_real_select_node):
Only redraw one the node being selected.
* gtk/gtktreeprivate.h: Add _gtk_tree_view_queue_draw_node.
Wed Jan 2 23:09:06 2002 Tim Janik <timj@gtk.org> Wed Jan 2 23:09:06 2002 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c (_gtk_container_queue_resize): don't ignore * gtk/gtkcontainer.c (_gtk_container_queue_resize): don't ignore
@ -9,6 +23,7 @@ Wed Jan 2 23:09:06 2002 Tim Janik <timj@gtk.org>
* gtk/Makefile.am (LDFLAGS): automake still doesn't support * gtk/Makefile.am (LDFLAGS): automake still doesn't support
libsomething_la_LDFLAGS, so fix the build again libsomething_la_LDFLAGS, so fix the build again
2002-01-01 Havoc Pennington <hp@pobox.com> 2002-01-01 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c (gtk_text_view_expose_event): propagate * gtk/gtktextview.c (gtk_text_view_expose_event): propagate

View File

@ -1,3 +1,17 @@
2002-01-03 Anders Carlsson <andersca@gnu.org>
* gtk/gtktreeview.c: Rename gtk_tree_view_queue_draw_node to
_gtk_tree_view_queue_draw_node.
(gtk_tree_view_row_has_child_toggled): Only redraw one node.
* gtk/gtktreesortable.c (gtk_tree_sortable_set_sort_func):
sort_column_id can be 0.
* gtk/gtktreeselection.c (gtk_tree_selection_real_select_node):
Only redraw one the node being selected.
* gtk/gtktreeprivate.h: Add _gtk_tree_view_queue_draw_node.
Wed Jan 2 23:09:06 2002 Tim Janik <timj@gtk.org> Wed Jan 2 23:09:06 2002 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c (_gtk_container_queue_resize): don't ignore * gtk/gtkcontainer.c (_gtk_container_queue_resize): don't ignore
@ -9,6 +23,7 @@ Wed Jan 2 23:09:06 2002 Tim Janik <timj@gtk.org>
* gtk/Makefile.am (LDFLAGS): automake still doesn't support * gtk/Makefile.am (LDFLAGS): automake still doesn't support
libsomething_la_LDFLAGS, so fix the build again libsomething_la_LDFLAGS, so fix the build again
2002-01-01 Havoc Pennington <hp@pobox.com> 2002-01-01 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c (gtk_text_view_expose_event): propagate * gtk/gtktextview.c (gtk_text_view_expose_event): propagate

View File

@ -275,7 +275,10 @@ void _gtk_tree_view_child_move_resize (GtkTreeView *tree_v
gint y, gint y,
gint width, gint width,
gint height); gint height);
void _gtk_tree_view_queue_draw_node (GtkTreeView *tree_view,
GtkRBTree *tree,
GtkRBNode *node,
GdkRectangle *clip_rect);
void _gtk_tree_view_column_realize_button (GtkTreeViewColumn *column); void _gtk_tree_view_column_realize_button (GtkTreeViewColumn *column);
void _gtk_tree_view_column_unrealize_button (GtkTreeViewColumn *column); void _gtk_tree_view_column_unrealize_button (GtkTreeViewColumn *column);

View File

@ -1112,8 +1112,8 @@ gtk_tree_selection_real_select_node (GtkTreeSelection *selection,
{ {
node->flags ^= GTK_RBNODE_IS_SELECTED; node->flags ^= GTK_RBNODE_IS_SELECTED;
/* FIXME: just draw the one node*/ _gtk_tree_view_queue_draw_node (selection->tree_view, tree, node, NULL);
gtk_widget_queue_draw (GTK_WIDGET (selection->tree_view));
return TRUE; return TRUE;
} }

View File

@ -168,7 +168,7 @@ gtk_tree_sortable_set_sort_func (GtkTreeSortable *sortable,
g_return_if_fail (iface != NULL); g_return_if_fail (iface != NULL);
g_return_if_fail (iface->set_sort_func != NULL); g_return_if_fail (iface->set_sort_func != NULL);
g_return_if_fail (sort_column_id > 0); g_return_if_fail (sort_column_id >= 0);
(* iface->set_sort_func) (sortable, sort_column_id, sort_func, user_data, destroy); (* iface->set_sort_func) (sortable, sort_column_id, sort_func, user_data, destroy);
} }

View File

@ -273,10 +273,6 @@ static void gtk_tree_view_add_move_binding (GtkBindingSet
gint count); gint count);
static gint gtk_tree_view_unref_and_check_selection_tree (GtkTreeView *tree_view, static gint gtk_tree_view_unref_and_check_selection_tree (GtkTreeView *tree_view,
GtkRBTree *tree); GtkRBTree *tree);
static void gtk_tree_view_queue_draw_node (GtkTreeView *tree_view,
GtkRBTree *tree,
GtkRBNode *node,
GdkRectangle *clip_rect);
static void gtk_tree_view_queue_draw_path (GtkTreeView *tree_view, static void gtk_tree_view_queue_draw_path (GtkTreeView *tree_view,
GtkTreePath *path, GtkTreePath *path,
GdkRectangle *clip_rect); GdkRectangle *clip_rect);
@ -2497,24 +2493,24 @@ gtk_tree_view_motion_bin_window (GtkWidget *widget,
{ {
if (old_prelight_node) if (old_prelight_node)
{ {
gtk_tree_view_queue_draw_node (tree_view, _gtk_tree_view_queue_draw_node (tree_view,
old_prelight_tree, old_prelight_tree,
old_prelight_node, old_prelight_node,
NULL); NULL);
} }
if (tree_view->priv->prelight_node) if (tree_view->priv->prelight_node)
{ {
gtk_tree_view_queue_draw_node (tree_view, _gtk_tree_view_queue_draw_node (tree_view,
tree_view->priv->prelight_tree, tree_view->priv->prelight_tree,
tree_view->priv->prelight_node, tree_view->priv->prelight_node,
NULL); NULL);
} }
} }
else if (old_arrow_prelit != GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_ARROW_PRELIT)) else if (old_arrow_prelit != GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_ARROW_PRELIT))
{ {
if (tree_view->priv->prelight_node) if (tree_view->priv->prelight_node)
{ {
gtk_tree_view_queue_draw_node (tree_view, _gtk_tree_view_queue_draw_node (tree_view,
tree_view->priv->prelight_tree, tree_view->priv->prelight_tree,
tree_view->priv->prelight_node, tree_view->priv->prelight_node,
NULL); NULL);
@ -3030,7 +3026,7 @@ gtk_tree_view_enter_notify (GtkWidget *widget,
do_prelight (tree_view, tree, node, event->x, event->y); do_prelight (tree_view, tree, node, event->x, event->y);
if (tree_view->priv->prelight_node) if (tree_view->priv->prelight_node)
gtk_tree_view_queue_draw_node (tree_view, _gtk_tree_view_queue_draw_node (tree_view,
tree_view->priv->prelight_tree, tree_view->priv->prelight_tree,
tree_view->priv->prelight_node, tree_view->priv->prelight_node,
NULL); NULL);
@ -3052,7 +3048,7 @@ gtk_tree_view_leave_notify (GtkWidget *widget,
tree_view = GTK_TREE_VIEW (widget); tree_view = GTK_TREE_VIEW (widget);
if (tree_view->priv->prelight_node) if (tree_view->priv->prelight_node)
gtk_tree_view_queue_draw_node (tree_view, _gtk_tree_view_queue_draw_node (tree_view,
tree_view->priv->prelight_tree, tree_view->priv->prelight_tree,
tree_view->priv->prelight_node, tree_view->priv->prelight_node,
NULL); NULL);
@ -4985,8 +4981,7 @@ gtk_tree_view_row_has_child_toggled (GtkTreeModel *model,
} }
else else
{ {
/* FIXME: Just redraw the node */ _gtk_tree_view_queue_draw_node (tree_view, tree, node, NULL);
gtk_widget_queue_draw (GTK_WIDGET (tree_view));
} }
done: done:
@ -5860,11 +5855,11 @@ gtk_tree_view_queue_draw_arrow (GtkTreeView *tree_view,
} }
} }
static void void
gtk_tree_view_queue_draw_node (GtkTreeView *tree_view, _gtk_tree_view_queue_draw_node (GtkTreeView *tree_view,
GtkRBTree *tree, GtkRBTree *tree,
GtkRBNode *node, GtkRBNode *node,
GdkRectangle *clip_rect) GdkRectangle *clip_rect)
{ {
GdkRectangle rect; GdkRectangle rect;
@ -5902,7 +5897,7 @@ gtk_tree_view_queue_draw_path (GtkTreeView *tree_view,
_gtk_tree_view_find_node (tree_view, path, &tree, &node); _gtk_tree_view_find_node (tree_view, path, &tree, &node);
if (tree) if (tree)
gtk_tree_view_queue_draw_node (tree_view, tree, node, clip_rect); _gtk_tree_view_queue_draw_node (tree_view, tree, node, clip_rect);
} }
/* x and y are the mouse position /* x and y are the mouse position
@ -6163,7 +6158,7 @@ gtk_tree_view_move_cursor_left_right (GtkTreeView *tree_view,
if (found_column) if (found_column)
{ {
gtk_tree_view_queue_draw_node (tree_view, _gtk_tree_view_queue_draw_node (tree_view,
cursor_tree, cursor_tree,
cursor_node, cursor_node,
NULL); NULL);
@ -6270,7 +6265,7 @@ gtk_tree_view_real_select_cursor_row (GtkTreeView *tree_view,
gtk_tree_view_clamp_node_visible (tree_view, cursor_tree, cursor_node); gtk_tree_view_clamp_node_visible (tree_view, cursor_tree, cursor_node);
gtk_widget_grab_focus (GTK_WIDGET (tree_view)); gtk_widget_grab_focus (GTK_WIDGET (tree_view));
gtk_tree_view_queue_draw_node (tree_view, cursor_tree, cursor_node, NULL); _gtk_tree_view_queue_draw_node (tree_view, cursor_tree, cursor_node, NULL);
gtk_tree_view_row_activated (tree_view, cursor_path, tree_view->priv->focus_column); gtk_tree_view_row_activated (tree_view, cursor_path, tree_view->priv->focus_column);
gtk_tree_path_free (cursor_path); gtk_tree_path_free (cursor_path);
@ -8157,7 +8152,7 @@ gtk_tree_view_real_set_cursor (GtkTreeView *tree_view,
node, tree, path, node, tree, path,
state); state);
gtk_tree_view_clamp_node_visible (tree_view, tree, node); gtk_tree_view_clamp_node_visible (tree_view, tree, node);
gtk_tree_view_queue_draw_node (tree_view, tree, node, NULL); _gtk_tree_view_queue_draw_node (tree_view, tree, node, NULL);
} }
g_signal_emit (G_OBJECT (tree_view), tree_view_signals[CURSOR_CHANGED], 0); g_signal_emit (G_OBJECT (tree_view), tree_view_signals[CURSOR_CHANGED], 0);