http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=50648
User: morriss
Date: 2013/07/15 05:53 PM
Log:
Manually copy over from trunk:
------------------------------------------------------------------------
r50479 | darkjames | 2013-07-09 21:50:27 -0400 (Tue, 09 Jul 2013) | 4 lines
Changed paths:
M /trunk/ui/gtk/packet_panes.c
Fix bug #8908: Strange behavior of tree expand/collapse in packet details
Only expand subtree when parent was also expanded
------------------------------------------------------------------------
r50516 | morriss | 2013-07-11 19:01:13 -0400 (Thu, 11 Jul 2013) | 13 lines
Changed paths:
M /trunk/ui/gtk/packet_panes.c
Fix the problem reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8908#c3
(the last remaining problem in that bug report):
When we expand a tree, check if any of its children need to be expanded too
(because the user left them expanded when s/he closed the parent).
In the process, rename expand_finfos() to check_expand_children() since the
function expands any children (subtrees) which should be expanded. Remove
one of that function's parameters too: just reference the global preference
that controls whether scrolling should be done or not.
Replace some tabs with spaces (for consistency).
------------------------------------------------------------------------
r50535 | morriss | 2013-07-12 09:56:14 -0400 (Fri, 12 Jul 2013) | 11 lines
Changed paths:
M /trunk/ui/gtk/packet_panes.c
As suggested by Jakub in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8908#c8 :
When auto-expanding previously-expanded children (r50516), only apply
auto-scrolling to the tree the user just expanded (not any of its children
which were auto-expanded).
Also: only expand children of the just-expanded tree, not all instances of
the just-expanded tree. This prevents expanding, for example, one SCTP chunk's
tree from expanding all other chunks in the same frame. (Of course moving
between frames will cause the chunks' trees to be expanded.)
------------------------------------------------------------------------
r50595 | morriss | 2013-07-14 21:46:47 -0400 (Sun, 14 Jul 2013) | 13 lines
Changed paths:
M /trunk/ui/gtk/packet_panes.c
One more try at fixing all the issues reported in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8908 :
Rename check_expand_children() to check_expand_trees() since the function
doesn't just do the children of the current path/iter.
Add a parameter to that function which controls whether the parent (or just
the children) get expanded.
As suggest by Jakub in the bug: block further calls to expand_tree() when
we're expanding all these trees. Add a comment telling callers of
check_expand_trees() to do that.
------------------------------------------------------------------------
Directory: /trunk-1.10/ui/gtk/
Changes Path Action
+61 -22 packet_panes.c Modified