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

treeview: Invalidate on expander changes, don't just repaint

Browse Source 
Repaints are supposed to be initiated by GDK, not by random repaints.
This commit is contained in:
Benjamin Otte 2010-09-06 13:27:50 +02:00
parent bc1cd6c5cb
commit 62f5fdc856
1 changed files with 12 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gtk/gtktreeview.c
View File

@ -324,8 +324,7 @@ static void gtk_tree_view_queue_draw_path (GtkTreeView
const GdkRectangle *clip_rect); const GdkRectangle *clip_rect);
static void gtk_tree_view_queue_draw_arrow (GtkTreeView *tree_view, static void gtk_tree_view_queue_draw_arrow (GtkTreeView *tree_view,
GtkRBTree *tree, GtkRBTree *tree,
GtkRBNode *node, GtkRBNode *node);
const GdkRectangle *clip_rect);
static void gtk_tree_view_draw_arrow (GtkTreeView *tree_view, static void gtk_tree_view_draw_arrow (GtkTreeView *tree_view,
GtkRBTree *tree, GtkRBTree *tree,
GtkRBNode *node, GtkRBNode *node,
@ -2612,11 +2611,9 @@ gtk_tree_view_button_press (GtkWidget *widget,
gtk_grab_add (widget); gtk_grab_add (widget);
tree_view->priv->button_pressed_node = tree_view->priv->prelight_node; tree_view->priv->button_pressed_node = tree_view->priv->prelight_node;
tree_view->priv->button_pressed_tree = tree_view->priv->prelight_tree; tree_view->priv->button_pressed_tree = tree_view->priv->prelight_tree;
gtk_tree_view_draw_arrow (GTK_TREE_VIEW (widget), gtk_tree_view_queue_draw_arrow (GTK_TREE_VIEW (widget),
tree_view->priv->prelight_tree, tree_view->priv->prelight_tree,
tree_view->priv->prelight_node, tree_view->priv->prelight_node);
event->x,
event->y);
} }
grab_focus_and_unset_draw_keyfocus (tree_view); grab_focus_and_unset_draw_keyfocus (tree_view);
@ -3223,7 +3220,7 @@ do_prelight (GtkTreeView *tree_view,
GTK_TREE_VIEW_UNSET_FLAG (tree_view, GTK_TREE_VIEW_UNSET_FLAG (tree_view,
GTK_TREE_VIEW_ARROW_PRELIT); GTK_TREE_VIEW_ARROW_PRELIT);
gtk_tree_view_draw_arrow (tree_view, tree, node, x, y); gtk_tree_view_queue_draw_arrow (tree_view, tree, node);
} }
} }
@ -3242,11 +3239,9 @@ do_prelight (GtkTreeView *tree_view,
{ {
GTK_TREE_VIEW_UNSET_FLAG (tree_view, GTK_TREE_VIEW_ARROW_PRELIT); GTK_TREE_VIEW_UNSET_FLAG (tree_view, GTK_TREE_VIEW_ARROW_PRELIT);
gtk_tree_view_draw_arrow (tree_view, gtk_tree_view_queue_draw_arrow (tree_view,
tree_view->priv->prelight_tree, tree_view->priv->prelight_tree,
tree_view->priv->prelight_node, tree_view->priv->prelight_node);
x,
y);
} }
_gtk_tree_view_queue_draw_node (tree_view, _gtk_tree_view_queue_draw_node (tree_view,
@ -3273,7 +3268,7 @@ do_prelight (GtkTreeView *tree_view,
{ {
GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_ARROW_PRELIT); GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_ARROW_PRELIT);
gtk_tree_view_draw_arrow (tree_view, tree, node, x, y); gtk_tree_view_queue_draw_arrow (tree_view, tree, node);
} }
GTK_RBNODE_SET_FLAG (node, GTK_RBNODE_IS_PRELIT); GTK_RBNODE_SET_FLAG (node, GTK_RBNODE_IS_PRELIT);
@ -9450,8 +9445,7 @@ _gtk_tree_view_column_start_drag (GtkTreeView *tree_view,
static void static void
gtk_tree_view_queue_draw_arrow (GtkTreeView *tree_view, gtk_tree_view_queue_draw_arrow (GtkTreeView *tree_view,
GtkRBTree *tree, GtkRBTree *tree,
GtkRBNode *node, GtkRBNode *node)
const GdkRectangle *clip_rect)
{ {
GtkAllocation allocation; GtkAllocation allocation;
GdkRectangle rect; GdkRectangle rect;
@ -9466,18 +9460,7 @@ gtk_tree_view_queue_draw_arrow (GtkTreeView *tree_view,
rect.y = BACKGROUND_FIRST_PIXEL (tree_view, tree, node); rect.y = BACKGROUND_FIRST_PIXEL (tree_view, tree, node);
rect.height = ROW_HEIGHT (tree_view, BACKGROUND_HEIGHT (node)); rect.height = ROW_HEIGHT (tree_view, BACKGROUND_HEIGHT (node));
if (clip_rect) gdk_window_invalidate_rect (tree_view->priv->bin_window, &rect, TRUE);
{
GdkRectangle new_rect;
gdk_rectangle_intersect (clip_rect, &rect, &new_rect);
gdk_window_invalidate_rect (tree_view->priv->bin_window, &new_rect, TRUE);
}
else
{
gdk_window_invalidate_rect (tree_view->priv->bin_window, &rect, TRUE);
}
} }
void void
@ -12043,7 +12026,7 @@ do_expand_collapse (GtkTreeView *tree_view)
if (redraw) if (redraw)
{ {
gtk_tree_view_queue_draw_arrow (tree_view, tree, node, NULL); gtk_tree_view_queue_draw_arrow (tree_view, tree, node);
return TRUE; return TRUE;
} }