diff options
| author | Kristian Rietveld <kris@imendio.com> | 2006-04-30 15:49:25 +0000 |
|---|---|---|
| committer | Kristian Rietveld <kristian@src.gnome.org> | 2006-04-30 15:49:25 +0000 |
| commit | 9fd0d4b8b95bd3d47f80688ba3e7f37c58912436 (patch) | |
| tree | 20cb95b9d7357ca586c89a546b663c7bea6d4430 | |
| parent | 30d7ff21f6349d88a6e86a571f350a68e6d77cd4 (diff) | |
| download | gdk-pixbuf-9fd0d4b8b95bd3d47f80688ba3e7f37c58912436.tar.gz | |
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.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 9 | ||||
| -rw-r--r-- | gtk/gtktreeview.c | 23 |
3 files changed, 21 insertions, 20 deletions
@@ -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> Fix problems with setting symbolic colors from rc files. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b8a952aab..f606fc1c8 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -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> Fix problems with setting symbolic colors from rc files. diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 1fff6384f..e92e3ad63 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -11847,13 +11847,10 @@ gtk_tree_view_get_cell_area (GtkTreeView *tree_view, if (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)) { @@ -13474,20 +13471,6 @@ 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)) - { - 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, &editable_widget, NULL, |