projects
/
geeqie.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ba734b4
)
Start the basics of setting the CLUSTER_CHILD flag on children.
author
Omari Stephens
<xsdg@google.com>
Sun, 9 Jul 2017 18:21:12 +0000
(18:21 +0000)
committer
Omari Stephens
<xsdg@google.com>
Mon, 10 Jul 2017 08:00:55 +0000
(08:00 +0000)
src/view_file/view_file_icon.c
patch
|
blob
|
history
diff --git
a/src/view_file/view_file_icon.c
b/src/view_file/view_file_icon.c
index
c2a423b
..
cd5d05c
100644
(file)
--- a/
src/view_file/view_file_icon.c
+++ b/
src/view_file/view_file_icon.c
@@
-1267,7
+1267,6
@@
gboolean vficon_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer dat
fc = fileclusterlist_create_cluster(vf->cluster_list, VFICON(vf)->selection);
if (fc)
{
fc = fileclusterlist_create_cluster(vf->cluster_list, VFICON(vf)->selection);
if (fc)
{
- // TODO(xsdg): set CLUSTER_CHILD
vficon_selection_add(vf, VFICON(vf)->selection->data, SELECTION_CLUSTER_HEAD, NULL);
vf_refresh(vf);
}
vficon_selection_add(vf, VFICON(vf)->selection->data, SELECTION_CLUSTER_HEAD, NULL);
vf_refresh(vf);
}
@@
-1293,7
+1292,18
@@
gboolean vficon_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer dat
FileCluster *fc = g_hash_table_lookup(vf->cluster_list->clusters, fd);
if (fc)
{
FileCluster *fc = g_hash_table_lookup(vf->cluster_list->clusters, fd);
if (fc)
{
- filecluster_toggle_show_children(fc);
+ if (filecluster_toggle_show_children(fc))
+ {
+ for (GList *work = fc->items; work; work = work->next)
+ {
+ // TODO(xsdg): This is broken because the FileData pointer stored in the
+ // cluster is different from the one just added to vf->list, even though
+ // they are equivalent.
+ FileData *fd = work->data;
+ if (work == fc->head) continue;
+ vficon_selection_add(vf, fd, SELECTION_CLUSTER_CHILD, NULL);
+ }
+ }
vf_refresh(vf);
}
}
vf_refresh(vf);
}
}