improved expanding and hiding of helper keywords

diff --git a/src/bar_keywords.c b/src/bar_keywords.c
index c7e34e7..275450e 100644 (file)
--- a/src/bar_keywords.c
+++ b/src/bar_keywords.c
@@ -163,12 +163,10 @@ gboolean bar_keyword_tree_collapse_if_unset_cb(GtkTreeModel *model, GtkTreePath
 {
        PaneKeywordsData *pkd = data;
        gboolean set;
-       gboolean is_keyword;
 
-       gtk_tree_model_get(model, iter, FILTER_KEYWORD_COLUMN_TOGGLE, &set,
-                                       FILTER_KEYWORD_COLUMN_IS_KEYWORD, &is_keyword, -1);
+       gtk_tree_model_get(model, iter, FILTER_KEYWORD_COLUMN_TOGGLE, &set, -1);
        
-       if (is_keyword && !set && gtk_tree_view_row_expanded(GTK_TREE_VIEW(pkd->keyword_treeview), path))
+       if (!set && gtk_tree_view_row_expanded(GTK_TREE_VIEW(pkd->keyword_treeview), path))
                {
                gtk_tree_view_collapse_row(GTK_TREE_VIEW(pkd->keyword_treeview), path);
                }

diff --git a/src/metadata.c b/src/metadata.c
index f77a8a2..ca49e30 100644 (file)
--- a/src/metadata.c
+++ b/src/metadata.c
@@ -917,6 +917,20 @@ gboolean keyword_tree_get_iter(GtkTreeModel *keyword_tree, GtkTreeIter *iter_ptr
 static gboolean keyword_tree_is_set_casefold(GtkTreeModel *keyword_tree, GtkTreeIter iter, GList *casefold_list)
 {
        if (!casefold_list) return FALSE;
+
+       if (!keyword_get_is_keyword(keyword_tree, &iter))
+               {
+               /* for the purpose of expanding and hiding, a helper is set if it has any children set */
+               GtkTreeIter child;
+               if (!gtk_tree_model_iter_children(keyword_tree, &child, &iter)) 
+                       return FALSE; /* this should happen only on empty helpers */
+
+               while (TRUE)
+                       {
+                       if (keyword_tree_is_set_casefold(keyword_tree, child, casefold_list)) return TRUE;
+                       if (!gtk_tree_model_iter_next(keyword_tree, &child)) return FALSE;
+                       }
+               }
        
        while (TRUE)
                {
@@ -953,8 +967,6 @@ gboolean keyword_tree_is_set(GtkTreeModel *keyword_tree, GtkTreeIter *iter, GLis
        GList *casefold_list = NULL;
        GList *work;
 
-       if (!keyword_get_is_keyword(keyword_tree, iter)) return FALSE;
-       
        work = kw_list;
        while (work)
                {
@@ -1130,8 +1142,7 @@ static void keyword_hide_unset_in_recursive(GtkTreeStore *keyword_tree, GtkTreeI
        GtkTreeIter iter = *iter_ptr;
        while (TRUE)
                {
-               if (keyword_get_is_keyword(GTK_TREE_MODEL(keyword_tree), &iter) && 
-                   !keyword_tree_is_set(GTK_TREE_MODEL(keyword_tree), &iter, keywords))
+               if (!keyword_tree_is_set(GTK_TREE_MODEL(keyword_tree), &iter, keywords))
                        {
                        keyword_hide_in(keyword_tree, &iter, id);
                        /* no need to check children of hidden node */