Merge lp:~kiwinote/software-center/lp877130 into lp:software-center

[Kiwinote]

[Michael Vogt (mvo)]

Thanks for your work on this! That is very nice and works like a charm.

I would love to tweak it a little bit to remove some of the duplication in the code, if you don't
mind I will do that and ask you for review again.

[Michael Vogt (mvo)]

Setting this to approve as it fixes the issue nicely, I put up a additional MP that tweaks it slighly.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-04-11 21:05:07 +0000
+++ debian/changelog	2012-04-12 10:12:18 +0000
@@ -15,7 +15,12 @@
   * lp:~davmor2/software-center/remove_two_lines:
     - small fixes for test script USC-start-stop-times.py
 
- -- Gary Lasker <[e-mail]>  Wed, 11 Apr 2012 17:03:44 -0400
+  [ Kiwinote ]
+  * sc/ui/gtk3/widgets/apptreeview.py:
+    - everyone tries to expand a category in the installed pane by clicking
+      on the text rather than the expander arrow (LP: #877130)
+
+ -- Kiwinote <[e-mail]>  Thu, 12 Apr 2012 11:00:48 +0100
 
 software-center (5.1.14.2) precise; urgency=low
 
 
=== modified file 'softwarecenter/ui/gtk3/widgets/apptreeview.py'
--- softwarecenter/ui/gtk3/widgets/apptreeview.py	2012-04-10 05:05:22 +0000
+++ softwarecenter/ui/gtk3/widgets/apptreeview.py	2012-04-12 10:12:18 +0000
@@ -397,7 +397,22 @@
         return path
 
     def _on_button_press_event(self, view, event, tr):
-        if not self._on_button_event_get_path(view, event):
+        path = self._on_button_event_get_path(view, event)
+        if not path:
+            # ^path has too much filtered out, so check it properly here
+            res = view.get_path_at_pos(int(event.x), int(event.y))
+            if not res or event.button != 1:
+                return
+            path = res[0]
+            is_cat = self.rowref_is_category(self.get_rowref(view.get_model(),
+                     path))
+            if is_cat:
+                if view.row_expanded(path):
+                    view.collapse_row(path)
+                else:
+                    view.expand_row(path, True)
+                return True  # swallow event to avoid double action when
+                             # clicking on the expander arrow itself
             return
 
         self.pressed = True