[meld/VersionControlRework: 58/123] vcview: Expand top-level as the last thing we do for flattened views



commit a329c7ba4db5f5af9b3ce9a14777457190f9329c
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Mar 29 12:44:41 2015 +1000

    vcview: Expand top-level as the last thing we do for flattened views

 meld/vcview.py |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/meld/vcview.py b/meld/vcview.py
index f49fc97..43b8b92 100644
--- a/meld/vcview.py
+++ b/meld/vcview.py
@@ -461,15 +461,15 @@ class VcView(melddoc.MeldDoc, gnomeglade.Component):
                     todo.append((self.model.get_path(child), e.path))
                 self._update_item_state(child, e, path[prefixlen:])
 
-            if flattened:
-                root = Gtk.TreePath.new_first()
-                self.treeview.expand_row(Gtk.TreePath(root), False)
-            else:
+            if not flattened:
                 if not entries:
                     self.model.add_empty(it, _("(Empty)"))
                 if any(e.state != tree.STATE_NORMAL for e in entries):
                     self.treeview.expand_to_path(treepath)
 
+        if flattened:
+            self.treeview.expand_row(Gtk.TreePath.new_first(), False)
+
     # TODO: This doesn't fire when the user selects a shortcut folder
     def on_fileentry_file_set(self, fileentry):
         directory = fileentry.get_file()


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]