Changeset 12400

Timestamp:

08/30/10 05:47:05 (18 months ago)

Author:

adamk

Message:

Save and restore the directory tree state as we move back and forth between projects

Location:

trunk/Padre/lib/Padre/Wx

Files:

• Directory.pm (modified) (5 diffs)
• Directory/TreeCtrl.pm (modified) (1 diff)
• TreeCtrl.pm (modified) (2 diffs)

trunk/Padre/lib/Padre/Wx/Directory.pm

@@ -100 +100 @@
     $self->{tree}->SetPlData(
         $self->{tree}->GetRootItem,
-        Wx::TreeItemData->new(
-            Padre::Wx::Directory::Path->directory,
-        ),
+        Padre::Wx::Directory::Path->directory,
     );
     Wx::Event::EVT_TREE_ITEM_EXPANDED(
@@ -258 +256 @@
     my $self   = shift;
     my $tree   = $self->{tree};
-    my $files  = delete $self->{files};
+    my $root   = $tree->GetRootItem;
+    my $files  = delete $self->{files}  or return;
     my $expand = delete $self->{expand} or return;
-    my @stack  = $tree->GetRootItem;
-    foreach my $i ( 0 .. $#$files ) {
+    my @stack  = ();
+    my $lock   = $self->main->lock('UPDATE');
+    foreach my $i ( 1 .. $#$files ) {
         my $path  = $files->[$i];
         my $image = $path->type ? 'folder' : 'package';
-        unless ( $tree->GetPlData($stack[-1])->GetData->is_parent($path) ) {
-            if ( $files->[$i - 1]->is_parent($path) ) {
-                # Descending
-                push @stack, $tree->GetLastChild($stack[-1]);
-            } else {
-                # Ascending
-                while ( @stack ) {
-                    pop @stack;
-                    if ( $tree->GetPlData($stack[-1])->GetData->is_parent($path) ) {
-                        last;
-                    }
-                }
-            }                   
-        }
-        $tree->AppendItem(
-            $stack[-1],                   # Parent node
+        while (@stack) {
+
+            # If we are not the child of the deepest element in
+            # the stack, move up a level and try again
+            last if $tree->GetPlData( $stack[-1] )->is_parent($path);
+
+            # We have finished filling the directory.
+            # Now it (maybe) has children, we can expand it.
+            my $complete = pop @stack;
+            if ( $expand->{ $tree->GetPlData($complete)->unix } ) {
+                $tree->Expand($complete);
+            }
+        }
+
+        # If there is anything left on the stack it is our parent
+        my $parent = $stack[-1] || $root;
+
+        # Add the next item to that parent
+        my $item = $tree->AppendItem(
+            $parent,                      # Parent node
             $path->name,                  # Label
             $tree->{images}->{$image},    # Icon
@@ -285 +289 @@
             Wx::TreeItemData->new($path), # Embedded data
         );
-    }
-}
-        
+
+        # If it is a folder, it goes onto the stack
+        if ( $path->type == 1 ) {
+            push @stack, $item;
+        }
+    }
+
+    # Apply the same Expand logic above to any remaining stack elements
+    while (@stack) {
+        my $complete = pop @stack;
+        if ( $expand->{ $tree->GetPlData($complete)->unix } ) {
+            $tree->Expand($complete);
+        }
+    }
+
+    # If we moved during the fill, move back
+    my $first = ($tree->GetFirstChild($root))[0];
+    $tree->ScrollTo($first) if $first->IsOk;
+
+    return 1;
+}
+
 
 
@@ -335 +358 @@
                     root   => $self->{root},
                     files  => $self->tree->GetChildrenPlData,
-                    expand => $self->tree->GetExpandedPlData,
+                    expand => $self->tree->expanded,
                 );
             }
@@ -354 +377 @@
             if ( $stash->{root} ) {
                 # We have a cached state
+                $self->{files}  = $stash->{files};
                 $self->{expand} = $stash->{expand};
+                $self->refill;
             }
         }
 
-        # Flush the search box and start the rerender
-        if ( $self->{expand} ) {
-            $self->browse( @{$self->{expand}} );
-        } else {
-            $self->browse;
-        }
+        # Flush the search box and restart
+        $self->browse;
     }
 

trunk/Padre/lib/Padre/Wx/Directory/TreeCtrl.pm

@@ -185 +185 @@
 # Returns a reference to a HASH of ->unix path strings.
 sub expanded {
-    my $self   = shift;
-    my @queue  = $self->GetRootItem;
-    my %expand = ();
-    while (@queue) {
-        my $parent = shift @queue;
-        my ( $child, $cookie ) = $self->GetFirstChild($parent);
-        while ($child) {
-            if ( $self->IsExpanded($child) ) {
-                $expand{ $self->GetPlData($child)->unix } = 1;
-                push @queue, $child;
-            }
-            ( $child, $cookie ) = $self->GetNextChild( $parent, $cookie );
-        }
-    }
-    return \%expand;
+    my $self  = shift;
+    my $items = $self->GetExpandedPlData;
+    my %hash  = map { $_->unix => 1 } @$items;
+    return \%hash;
 }
 

trunk/Padre/lib/Padre/Wx/TreeCtrl.pm

@@ -43 +43 @@
     while ( @queue ) {
         my $item = shift @queue;
-        push @data, $self->GetPlData($item)->GetData;
-
-        # Continue if we have no child nodes
-        next unless $self->GetChildrenCount( $item, 0 );
+        push @data, $self->GetPlData($item);
 
         # Processing children last to first and unshifting onto the
         # queue, lets us achieve depth-first top-down within the need
         # for intermediate storage or grepping.
-        my ( $child, $cookie ) = $self->GetLastChild($item);
-        while ( $cookie ) {
+        my $child = $self->GetLastChild($item);
+        while ( $child->IsOk ) {
             unshift @queue, $child;
-            ( $child, $cookie ) = $self->GetPreviousChild( $item, $cookie );
+            $child = $self->GetPrevSibling($child);
         }
     }
@@ -69 +66 @@
     while ( @queue ) {
         my $item = shift @queue;
-        push @data, $self->GetPlData($item)->GetData;
+        push @data, $self->GetPlData($item);
 
         # Processing children last to first and unshifting onto the
         # queue, lets us achieve depth-first top-down within the need
         # for intermediate storage or grepping.
-        my ( $child, $cookie ) = $self->GetLastChild($item);
-        while ( $cookie ) {
-            if ( $self->IsExpanded ) {
+        my $child = $self->GetLastChild($item);
+        while ( $child->IsOk ) {
+            if ( $self->IsExpanded($child) ) {
                 unshift @queue, $child;
             }
-            ( $child, $cookie ) = $self->GetPreviousChild( $item, $cookie );
+            $child = $self->GetPrevSibling($child);
         }
     }