Changeset 12412

Timestamp:

08/31/10 02:54:16 (18 months ago)

Author:

adamk

Message:

browse_message responses now correctly overlay existing directory entries, adding or removing entries as needed.

File:

• trunk/Padre/lib/Padre/Wx/Directory.pm (modified) (4 diffs)

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

@@ -259 +259 @@
     my $files  = delete $self->{files}  or return;
     my $expand = delete $self->{expand} or return;
+    my $lock   = $self->main->lock('UPDATE');
     my @stack  = ();
-    my $lock   = $self->main->lock('UPDATE');
     shift @$files;
     foreach my $path ( @$files ) {
@@ -434 +434 @@
     while ( @_ ) {
         if ( $child->IsOk ) {
-
-            # We are not past the last entry
-            my $current = $tree->GetPlData($child);
-            if ( $current->name eq $_[0]->name ) {
-                # Already exists, discard the duplicate
-                shift;
-            } elsif (
-                $current->is_directory < $_[0]->is_directory
-                and
-                lc($current->name) gt lc($_[0]->name)
-            ) {
+            # Are we before, after, or a duplicate
+            my $compare = $self->compare( $_[0], $tree->GetPlData($child) );
+            if ( $compare > 0 ) {
+                # Deleted entry, remove the current position
+                my $delete = $child;
+                ($child, $cookie) = $tree->GetNextChild($cursor, $cookie);
+                $tree->Delete($delete);
+
+            } elsif ( $compare < 0 ) {
+                # New entry, insert before the current position
                 my $path = shift;
                 $tree->InsertItem(
@@ -454 +453 @@
                     Wx::TreeItemData->new($path),      # Embedded data
                 );
-                $position += 1;
+                $position++;
+
             } else {
+                # Already exists, discard the duplicate
                 ($child, $cookie) = $tree->GetNextChild($cursor, $cookie);
-                $position += 1;
+                $position++;
+                shift @_;
             }
 
@@ -652 +654 @@
 }
 
+# Compare two paths to see which should be first
+sub compare {
+    my $self  = shift;
+    my $left  = shift;
+    my $right = shift;
+    return (
+        $right->is_directory <=> $left->is_directory
+        or
+        lc($left->name) cmp lc($right->name)
+    );
+}
+
 1;