From: Kristian Rietveld Date: Thu, 29 May 2003 14:22:05 +0000 (+0000) Subject: Merged from stable. X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=bdff7cdb1aae7d55bbd883a036e646c7d5389966;p=~andy%2Fgtk Merged from stable. Thu May 29 16:14:04 2003 Kristian Rietveld Merged from stable. * gtk/gtktreeview.c (gtk_tree_view_start_editing): correct cell_area x/width for the expander if needed. (Fixes #101748, reported by Dave Cook and Mariano Suarez-Alvarez). --- diff --git a/ChangeLog b/ChangeLog index c58be12d3..59857194d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ +Thu May 29 16:14:04 2003 Kristian Rietveld + + Merged from stable. + + * gtk/gtktreeview.c (gtk_tree_view_start_editing): correct + cell_area x/width for the expander if needed. (Fixes #101748, + reported by Dave Cook and Mariano Suarez-Alvarez). + Thu May 29 16:01:38 2003 Kristian Rietveld + Merged from stable. + * gtk/gtktreeview.c (gtk_tree_view_real_set_cursor): check if tree/node are still the same after _internal_select_node. (Fixes #92256, reported by edscott). diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c58be12d3..59857194d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,15 @@ +Thu May 29 16:14:04 2003 Kristian Rietveld + + Merged from stable. + + * gtk/gtktreeview.c (gtk_tree_view_start_editing): correct + cell_area x/width for the expander if needed. (Fixes #101748, + reported by Dave Cook and Mariano Suarez-Alvarez). + Thu May 29 16:01:38 2003 Kristian Rietveld + Merged from stable. + * gtk/gtktreeview.c (gtk_tree_view_real_set_cursor): check if tree/node are still the same after _internal_select_node. (Fixes #92256, reported by edscott). diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c58be12d3..59857194d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,5 +1,15 @@ +Thu May 29 16:14:04 2003 Kristian Rietveld + + Merged from stable. + + * gtk/gtktreeview.c (gtk_tree_view_start_editing): correct + cell_area x/width for the expander if needed. (Fixes #101748, + reported by Dave Cook and Mariano Suarez-Alvarez). + Thu May 29 16:01:38 2003 Kristian Rietveld + Merged from stable. + * gtk/gtktreeview.c (gtk_tree_view_real_set_cursor): check if tree/node are still the same after _internal_select_node. (Fixes #92256, reported by edscott). diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c58be12d3..59857194d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,15 @@ +Thu May 29 16:14:04 2003 Kristian Rietveld + + Merged from stable. + + * gtk/gtktreeview.c (gtk_tree_view_start_editing): correct + cell_area x/width for the expander if needed. (Fixes #101748, + reported by Dave Cook and Mariano Suarez-Alvarez). + Thu May 29 16:01:38 2003 Kristian Rietveld + Merged from stable. + * gtk/gtktreeview.c (gtk_tree_view_real_set_cursor): check if tree/node are still the same after _internal_select_node. (Fixes #92256, reported by edscott). diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c58be12d3..59857194d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,15 @@ +Thu May 29 16:14:04 2003 Kristian Rietveld + + Merged from stable. + + * gtk/gtktreeview.c (gtk_tree_view_start_editing): correct + cell_area x/width for the expander if needed. (Fixes #101748, + reported by Dave Cook and Mariano Suarez-Alvarez). + Thu May 29 16:01:38 2003 Kristian Rietveld + Merged from stable. + * gtk/gtktreeview.c (gtk_tree_view_real_set_cursor): check if tree/node are still the same after _internal_select_node. (Fixes #92256, reported by edscott). diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 87df9bc61..03fedd920 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -11263,6 +11263,12 @@ gtk_tree_view_start_editing (GtkTreeView *tree_view, tree_view->priv->focus_column, &cell_area); + if (gtk_tree_view_is_expander_column (tree_view, tree_view->priv->focus_column) && TREE_VIEW_DRAW_EXPANDERS (tree_view)) + { + cell_area.x += tree_view->priv->expander_size; + cell_area.width -= tree_view->priv->expander_size; + } + if (_gtk_tree_view_column_cell_event (tree_view->priv->focus_column, &editable_widget, NULL,