callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 666561 - Clicking on the expand icon next to a group expands the wrong group

Browse Source 
gimp_item_tree_view_row_expanded(): only select the active item if its
immediate parent was expanded, not if *any* group was expanded.
This commit is contained in:
Michael Natterer
2012-02-09 20:38:46 +01:00
parent b994280473
commit af6b840aaf
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/widgets/gimpitemtreeview.c
View File

@ -1562,14 +1562,28 @@ gimp_item_tree_view_row_expanded (GtkTreeView *tree_view,
if (! item_view->priv->inserting_item) if (! item_view->priv->inserting_item)
{ {
GimpItemTreeViewClass *item_view_class; GimpItemTreeViewClass *item_view_class;
GimpViewRenderer *renderer;
GimpItem *expanded_item;
GimpItem *active_item; GimpItem *active_item;
gtk_tree_model_get (GIMP_CONTAINER_TREE_VIEW (item_view)->model, iter,
GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER, &renderer,
-1);
expanded_item = GIMP_ITEM (renderer->viewable);
g_object_unref (renderer);
item_view_class = GIMP_ITEM_TREE_VIEW_GET_CLASS (item_view); item_view_class = GIMP_ITEM_TREE_VIEW_GET_CLASS (item_view);
active_item = item_view_class->get_active_item (item_view->priv->image); active_item = item_view_class->get_active_item (item_view->priv->image);
if (active_item) /* select the active item only if it was made visible by expanding
* its immediate parent. See bug #666561.
*/
if (active_item &&
gimp_item_get_parent (active_item) == expanded_item)
{
gimp_container_view_select_item (GIMP_CONTAINER_VIEW (item_view), gimp_container_view_select_item (GIMP_CONTAINER_VIEW (item_view),
GIMP_VIEWABLE (active_item)); GIMP_VIEWABLE (active_item));
} }
} }
}