Fix for #340200, spotted by Torsten Schoenfeld.

2006-04-30  Kristian Rietveld  <kris@imendio.com>

	Fix for #340200, spotted by Torsten Schoenfeld.

	* gtk/gtktreeview.c (gtk_tree_view_get_cell_area): fix up logic
	calculating the level indentation,
	(gtk_tree_view_start_editing): remove code calculating the
	level indentation, since _get_cell_area() takes care of this for us.
This commit is contained in:
Kristian Rietveld 2006-04-30 15:49:25 +00:00 committed by Kristian Rietveld
parent 30d7ff21f6
commit 9fd0d4b8b9
3 changed files with 21 additions and 20 deletions

View File

@ -1,3 +1,12 @@
2006-04-30 Kristian Rietveld <kris@imendio.com>
Fix for #340200, spotted by Torsten Schoenfeld.
* gtk/gtktreeview.c (gtk_tree_view_get_cell_area): fix up logic
calculating the level indentation,
(gtk_tree_view_start_editing): remove code calculating the
level indentation, since _get_cell_area() takes care of this for us.
2006-04-30 Matthias Clasen <mclasen@localhost.localdomain> 2006-04-30 Matthias Clasen <mclasen@localhost.localdomain>
Fix problems with setting symbolic colors from rc files. Fix problems with setting symbolic colors from rc files.

View File

@ -1,3 +1,12 @@
2006-04-30 Kristian Rietveld <kris@imendio.com>
Fix for #340200, spotted by Torsten Schoenfeld.
* gtk/gtktreeview.c (gtk_tree_view_get_cell_area): fix up logic
calculating the level indentation,
(gtk_tree_view_start_editing): remove code calculating the
level indentation, since _get_cell_area() takes care of this for us.
2006-04-30 Matthias Clasen <mclasen@localhost.localdomain> 2006-04-30 Matthias Clasen <mclasen@localhost.localdomain>
Fix problems with setting symbolic colors from rc files. Fix problems with setting symbolic colors from rc files.

View File

@ -11847,13 +11847,10 @@ gtk_tree_view_get_cell_area (GtkTreeView *tree_view,
if (column && if (column &&
gtk_tree_view_is_expander_column (tree_view, column)) gtk_tree_view_is_expander_column (tree_view, column))
{ {
gint depth = gtk_tree_path_get_depth (path) - 1; gint depth = gtk_tree_path_get_depth (path);
if (depth > 0) rect->x += (depth - 1) * tree_view->priv->level_indentation;
{ rect->width -= (depth - 1) * tree_view->priv->level_indentation;
rect->x += (depth - 1) * tree_view->priv->level_indentation;
rect->width -= (depth - 1) * tree_view->priv->level_indentation;
}
if (TREE_VIEW_DRAW_EXPANDERS (tree_view)) if (TREE_VIEW_DRAW_EXPANDERS (tree_view))
{ {
@ -13474,20 +13471,6 @@ gtk_tree_view_start_editing (GtkTreeView *tree_view,
tree_view->priv->focus_column, tree_view->priv->focus_column,
&cell_area); &cell_area);
if (gtk_tree_view_is_expander_column (tree_view, tree_view->priv->focus_column))
{
gint depth = gtk_tree_path_get_depth (cursor_path);
cell_area.x += (depth - 1) * tree_view->priv->level_indentation;
cell_area.width -= (depth - 1) * tree_view->priv->level_indentation;
if (TREE_VIEW_DRAW_EXPANDERS (tree_view))
{
cell_area.x += depth * tree_view->priv->expander_size;
cell_area.width -= depth * tree_view->priv->expander_size;
}
}
if (_gtk_tree_view_column_cell_event (tree_view->priv->focus_column, if (_gtk_tree_view_column_cell_event (tree_view->priv->focus_column,
&editable_widget, &editable_widget,
NULL, NULL,