Fixed bug 1595, Tree view collapsing triangle does not track mouse.

2000-09-13  Gene Z. Ragan  <gzr@eazel.com>

	Fixed bug 1595, Tree view collapsing triangle does not
	track mouse.

	* libnautilus-extensions/nautilus-ctree.c: (nautilus_ctree_event),
	(nautilus_ctree_draw_expander):
This commit is contained in:
Gene Z. Ragan 2000-09-14 00:08:36 +00:00 committed by Gene Ragan
parent b5ffe4dafb
commit 98d79cb481
3 changed files with 28 additions and 14 deletions

View file

@ -1,3 +1,11 @@
2000-09-13 Gene Z. Ragan <gzr@eazel.com>
Fixed bug 1595, Tree view collapsing triangle does not
track mouse.
* libnautilus-extensions/nautilus-ctree.c: (nautilus_ctree_event),
(nautilus_ctree_draw_expander):
2000-09-13 John Sullivan <sullivan@eazel.com> 2000-09-13 John Sullivan <sullivan@eazel.com>
Fixed bug 3039 (Clicking in edited file name exits rename mode) Fixed bug 3039 (Clicking in edited file name exits rename mode)

View file

@ -744,13 +744,14 @@ nautilus_ctree_event (GtkWidget *widget, GdkEvent *event, gpointer user_data)
} }
} else if (tree->prelight_node != NULL) { } else if (tree->prelight_node != NULL) {
/* End prelighting of last expander */ /* End prelighting of last expander */
old_node = tree->prelight_node;
tree->prelight_node = NULL; tree->prelight_node = NULL;
nautilus_ctree_draw_node (tree, node); nautilus_ctree_draw_node (tree, old_node);
} }
} }
} }
} }
return FALSE; return FALSE;
} }
@ -1160,11 +1161,13 @@ nautilus_ctree_draw_expander (NautilusCTree *ctree, NautilusCTreeRow *ctree_row,
gdk_draw_polygon (clist->clist_window, style->fg_gc[GTK_STATE_NORMAL], FALSE, points, 3); gdk_draw_polygon (clist->clist_window, style->fg_gc[GTK_STATE_NORMAL], FALSE, points, 3);
} else { } else {
node = nautilus_ctree_find_node_ptr (ctree, ctree_row); node = nautilus_ctree_find_node_ptr (ctree, ctree_row);
if (node != NULL && node == ctree->prelight_node) { if (node != NULL) {
/* Draw prelight state */ if (node == ctree->prelight_node) {
gdk_draw_polygon (clist->clist_window, style->fg_gc[GTK_STATE_NORMAL], FALSE, points, 3); /* Draw prelight state */
} else { gdk_draw_polygon (clist->clist_window, style->fg_gc[GTK_STATE_NORMAL], FALSE, points, 3);
gdk_draw_polygon (clist->clist_window, style->fg_gc[GTK_STATE_NORMAL], TRUE, points, 3); } else {
gdk_draw_polygon (clist->clist_window, style->fg_gc[GTK_STATE_NORMAL], TRUE, points, 3);
}
} }
} }

View file

@ -744,13 +744,14 @@ nautilus_ctree_event (GtkWidget *widget, GdkEvent *event, gpointer user_data)
} }
} else if (tree->prelight_node != NULL) { } else if (tree->prelight_node != NULL) {
/* End prelighting of last expander */ /* End prelighting of last expander */
old_node = tree->prelight_node;
tree->prelight_node = NULL; tree->prelight_node = NULL;
nautilus_ctree_draw_node (tree, node); nautilus_ctree_draw_node (tree, old_node);
} }
} }
} }
} }
return FALSE; return FALSE;
} }
@ -1160,11 +1161,13 @@ nautilus_ctree_draw_expander (NautilusCTree *ctree, NautilusCTreeRow *ctree_row,
gdk_draw_polygon (clist->clist_window, style->fg_gc[GTK_STATE_NORMAL], FALSE, points, 3); gdk_draw_polygon (clist->clist_window, style->fg_gc[GTK_STATE_NORMAL], FALSE, points, 3);
} else { } else {
node = nautilus_ctree_find_node_ptr (ctree, ctree_row); node = nautilus_ctree_find_node_ptr (ctree, ctree_row);
if (node != NULL && node == ctree->prelight_node) { if (node != NULL) {
/* Draw prelight state */ if (node == ctree->prelight_node) {
gdk_draw_polygon (clist->clist_window, style->fg_gc[GTK_STATE_NORMAL], FALSE, points, 3); /* Draw prelight state */
} else { gdk_draw_polygon (clist->clist_window, style->fg_gc[GTK_STATE_NORMAL], FALSE, points, 3);
gdk_draw_polygon (clist->clist_window, style->fg_gc[GTK_STATE_NORMAL], TRUE, points, 3); } else {
gdk_draw_polygon (clist->clist_window, style->fg_gc[GTK_STATE_NORMAL], TRUE, points, 3);
}
} }
} }