From 55615776fe6cd7ce4c36344816fd3df30ce3c54c Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Fri, 19 Mar 1999 21:59:34 +0000 Subject: [PATCH] 1999-03-19 Jonathan Blandford * gscreen.c (panel_tree_drag_motion): Dragging now automatically highlights the tree. God does it flicker... )-: * gtkdtree.h (gtk_dtree_construct): removed unused prototype. * gscreen.c (panel_tree_check_auto_expand): removed the auto-collapse of trees, as it is confusing to the user. --- gnome/ChangeLog | 8 ++++++++ gnome/gscreen.c | 8 +++++++- gnome/gtkdtree.h | 1 - 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/gnome/ChangeLog b/gnome/ChangeLog index 4b248011b..3515df8af 100644 --- a/gnome/ChangeLog +++ b/gnome/ChangeLog @@ -1,5 +1,13 @@ 1999-03-19 Jonathan Blandford + * gscreen.c (panel_tree_drag_motion): Dragging now automatically + highlights the tree. God does it flicker... )-: + + * gtkdtree.h (gtk_dtree_construct): removed unused prototype. + + * gscreen.c (panel_tree_check_auto_expand): removed the + auto-collapse of trees, as it is confusing to the user. + * gcustom-layout.c (custom_layout_set): We don't want to let the user remove all of the settings. diff --git a/gnome/gscreen.c b/gnome/gscreen.c index 60e5e84f7..0d50d7151 100644 --- a/gnome/gscreen.c +++ b/gnome/gscreen.c @@ -2044,6 +2044,8 @@ panel_tree_check_auto_expand (WPanel *panel, GtkCTreeNode *current) * so that the "current" stays the same place on the * screen */ +#if 0 + /* This behaviour is confusing --jrb and quartic (and MS, apparently)*/ if (tmp_list) { if (current) { row = g_list_position (clist->row_list, (GList *)current); @@ -2074,6 +2076,7 @@ panel_tree_check_auto_expand (WPanel *panel, GtkCTreeNode *current) free_list->prev = NULL; g_list_free (free_list); } +#endif } /** @@ -2132,7 +2135,10 @@ panel_tree_drag_motion (GtkWidget *widget, GdkDragContext *ctx, int x, int y, gu panel_tree_check_auto_expand (panel, current); } else panel_tree_check_auto_expand (panel, NULL); - + GTK_DTREE (widget)->internal = TRUE; + gtk_clist_select_row (GTK_CLIST (widget), row, 0); + GTK_DTREE (widget)->internal = FALSE; + panel->timer_id = gtk_timeout_add (400, tree_drag_open_directory, data); return TRUE; } diff --git a/gnome/gtkdtree.h b/gnome/gtkdtree.h index c6793553d..814740213 100644 --- a/gnome/gtkdtree.h +++ b/gnome/gtkdtree.h @@ -50,7 +50,6 @@ guint gtk_dtree_get_type (void); GtkWidget *gtk_dtree_new (void); void gtk_dtree_select_parent (GtkDTree *dtree, char *directory); -void gtk_dtree_select_child (GtkDTree *dtree); void gtk_dtree_remove_dir_by_name (GtkDTree *dtree, char *directory); gboolean gtk_dtree_select_dir (GtkDTree *dtree,