2005-03-30  Federico Mena Quintero  <federico@ximian.com>

	Fix #170755:

	* gtk/gtktreeview.c (gtk_tree_view_row_changed): Only stop editing
	if the row which changed is the same as the row being edited.
This commit is contained in:
Federico Mena Quintero
2005-03-30 21:46:01 +00:00
committed by Federico Mena Quintero
parent a39beed503
commit 273f24071c
4 changed files with 32 additions and 1 deletions

View File

@@ -1,3 +1,10 @@
2005-03-30 Federico Mena Quintero <federico@ximian.com>
Fix #170755:
* gtk/gtktreeview.c (gtk_tree_view_row_changed): Only stop editing
if the row which changed is the same as the row being edited.
2005-03-30 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search):

View File

@@ -1,3 +1,10 @@
2005-03-30 Federico Mena Quintero <federico@ximian.com>
Fix #170755:
* gtk/gtktreeview.c (gtk_tree_view_row_changed): Only stop editing
if the row which changed is the same as the row being edited.
2005-03-30 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search):

View File

@@ -1,3 +1,10 @@
2005-03-30 Federico Mena Quintero <federico@ximian.com>
Fix #170755:
* gtk/gtktreeview.c (gtk_tree_view_row_changed): Only stop editing
if the row which changed is the same as the row being edited.
2005-03-30 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search):

View File

@@ -7040,6 +7040,7 @@ gtk_tree_view_row_changed (GtkTreeModel *model,
gboolean free_path = FALSE;
gint vertical_separator;
GList *list;
GtkTreePath *cursor_path;
g_return_if_fail (path != NULL || iter != NULL);
@@ -7048,9 +7049,18 @@ gtk_tree_view_row_changed (GtkTreeModel *model,
*/
return;
if (tree_view->priv->edited_column)
if (tree_view->priv->cursor != NULL)
cursor_path = gtk_tree_row_reference_get_path (tree_view->priv->cursor);
else
cursor_path = NULL;
if (tree_view->priv->edited_column &&
(cursor_path == NULL || gtk_tree_path_compare (cursor_path, path) == 0))
gtk_tree_view_stop_editing (tree_view, TRUE);
if (cursor_path != NULL)
gtk_tree_path_free (cursor_path);
gtk_widget_style_get (GTK_WIDGET (data), "vertical_separator", &vertical_separator, NULL);
if (path == NULL)