Merge lp:~mmcg069/software-center/Bug888463 into lp:software-center

[Matthew McGowan]

A possible fix for Bug#888463.

Rows outside of the visible range do not currently get their height property updated when requested. Overcome this by checking if row is not in visible range when height update requested; if true, store the row for a time when it re-enters the visible range, and only then process the height update.

[Gary Lasker (gary-lasker)]

Does the trick, thanks Matt!

review: Approve

=== modified file 'softwarecenter/ui/gtk3/widgets/apptreeview.py'
--- softwarecenter/ui/gtk3/widgets/apptreeview.py	2011-11-09 10:09:16 +0000
+++ softwarecenter/ui/gtk3/widgets/apptreeview.py	2011-11-10 09:50:26 +0000
@@ -18,8 +18,8 @@
 from softwarecenter.backend import get_install_backend
 from softwarecenter.netstatus import (get_network_watcher,
                                       network_state_is_connected)
-from softwarecenter.ui.gtk3.models.appstore2 import (AppGenericStore,
-                                                     CategoryRowReference)
+from softwarecenter.ui.gtk3.models.appstore2 import (
+    AppGenericStore, CategoryRowReference)
 
 
 class AppTreeView(Gtk.TreeView):
@@ -43,6 +43,7 @@
         self.pressed = False
         self.focal_btn = None
         self._action_block_list = []
+        self._needs_collapse = []
         self.expanded_path = None
 
         #~ # if this hacked mode is available everything will be fast
@@ -126,24 +127,32 @@
         if vadjustment:
             vadjustment.set_value(0)
         self.expanded_path = None
+        self._needs_collapse = []
         if self.appmodel:
             self.appmodel.clear()
 
     def expand_path(self, path):
         if path is not None and not isinstance(path, Gtk.TreePath):
-            raise TypeError, "Expects Gtk.TreePath or None, got %s" % type(path)
+            raise TypeError, ("Expects Gtk.TreePath or None, got %s" %
+                              type(path))
 
         model = self.get_model()
         old = self.expanded_path
         self.expanded_path = path
 
         if old is not None:
-            try:
-                # lazy solution to Bug #846204
-                model.row_changed(old, model.get_iter(old))
-            except:
-                msg = "apptreeview.expand_path: Supplied 'old' path is an invalid tree path: '%s'" % old
-                logging.debug(msg)
+            ok, start, end = self.get_visible_range()
+            if (ok and start.compare(old) != -1 or
+                end.compare(old) != 1):
+                self._needs_collapse.append(old)
+            else:
+                try:  # try... a lazy solution to Bug #846204
+                    model.row_changed(old, model.get_iter(old))
+                except:
+                    msg = ("apptreeview.expand_path: Supplied 'old' "
+                           "path is an invalid tree path: '%s'" % old)
+                    logging.debug(msg)
+
         if path == None: return
 
         model.row_changed(path, model.get_iter(path))
@@ -313,8 +322,8 @@
         else:
             action_btn.set_state(Gtk.StateFlags.NORMAL)
 
-        #~ self.emit("application-selected", self.appmodel.get_application(app))
-        self.app_view.emit("application-selected", self.appmodel.get_application(app))
+        self.app_view.emit(
+            "application-selected", self.appmodel.get_application(app))
         return False
 
     def _on_row_activated(self, view, path, column, tr):
@@ -456,8 +465,16 @@
             indices = path.get_indices()
             model.load_range(indices, 5)
 
-        is_active = path == self.expanded_path
-        cell.set_property('isactive', is_active)
+        if path in self._needs_collapse:
+            # collapse rows that were outside the visible range and
+            # thus not immediately collapsed when expand_path was called
+            cell.set_property('isactive', False)
+            i = self._needs_collapse.index(path)
+            del self._needs_collapse[i]
+            model.row_changed(path, it)
+            return
+
+        cell.set_property('isactive', path == self.expanded_path)
         return
 
     def _app_activated_cb(self, btn, btn_id, app, store, path):
@@ -561,10 +578,6 @@
         return self.get_path_at_pos(x, y)[0] == self.get_cursor()[0]
 
 
-
-
-
-
 def get_query_from_search_entry(search_term):
     if not search_term:
         return xapian.Query("")