Merge lp:~mvo/software-center/lobby-visual-mvo-workaround-lp1048912 into lp:software-center

[Michael Vogt]

As discussed in the previous irc meeting this branch adds a workaround
for the visual corruption we see when recommendations are turned on.

Once the root cause for bug #1048912 the workaround can be removed,
this is documented in the code. The downside of this patch is additional
queue_draw() commands which is bad but the amount if not huge so the
tradeoff is worthwhile.

[Gary Lasker (gary-lasker)]

Thanks, Michael!

review: Approve

=== modified file 'softwarecenter/ui/gtk3/views/lobbyview.py'
--- softwarecenter/ui/gtk3/views/lobbyview.py	2012-09-17 15:17:48 +0000
+++ softwarecenter/ui/gtk3/views/lobbyview.py	2012-09-19 07:42:38 +0000
@@ -275,8 +275,21 @@
         self.recommended_for_you_panel.connect(
                 'more-button-clicked',
                 self.on_category_clicked)
+        # until bug #1048912 with the testcase in 
+        #    tests/gtk3/test_lp1048912.py
+        # is fixed this workaround for the drawing code in FramedHeaderBox
+        # is needed
+        self.recommended_for_you_panel.connect(
+            "size-allocate", self._on_recommended_for_you_panel_size_allocate)
         self.right_column.pack_start(self.recommended_for_you_panel,
                                     True, True, 0)
+                                    
+    def _on_recommended_for_you_panel_size_allocate(self, rec_panel, stuff):
+        """This workaround can go once the root cause for bug #1048912 is
+           found, see also tests/gtk3/test_lp1048912.py
+        """
+        #print ">>> called on_recommended_for_you_panel_size_allocate"
+        self.queue_draw()
 
     def _append_recommended_for_you(self):
         # update will (re)create the widget from scratch
 
=== modified file 'softwarecenter/ui/gtk3/widgets/containers.py'
--- softwarecenter/ui/gtk3/widgets/containers.py	2012-09-12 02:21:03 +0000
+++ softwarecenter/ui/gtk3/widgets/containers.py	2012-09-19 07:42:38 +0000
@@ -82,7 +82,7 @@
 
     # overrides
     def do_get_request_mode(self):
-        return Gtk.SizeRequestMode.HEIGHT_FOR_WIDTH
+        return Gtk.SizeRequestMode.WIDTH_FOR_HEIGHT
 
     def do_get_preferred_height_for_width(self, width):
         old = self.get_allocation()
 
=== modified file 'softwarecenter/ui/gtk3/widgets/spinner.py'
--- softwarecenter/ui/gtk3/widgets/spinner.py	2012-08-28 16:34:54 +0000
+++ softwarecenter/ui/gtk3/widgets/spinner.py	2012-09-19 07:42:38 +0000
@@ -2,6 +2,7 @@
 #
 # Authors:
 #  Gary Lasker
+#  Natalia Bidart
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
@@ -111,11 +112,13 @@
         """ show the spinner page with a alternative message """
         if msg:
             self.spinner_view.set_text(msg)
-        # "mask" the spinner view momentarily to prevent it from flashing into
+        # delay showing the spinner view prevent it from flashing into
         # view in the case of short delays where it isn't actually needed
-        self.spinner_view.stop_and_hide()
-        self._last_timeout_id = GObject.timeout_add(250,
-                                                    self._unmask_view_spinner)
+        # (but only if its not already visible anyway)
+        if self.get_current_page() == self.CONTENT_PAGE:
+            self.spinner_view.stop_and_hide()
+            self._last_timeout_id = GObject.timeout_add(
+                250, self._unmask_view_spinner)
 
     def hide_spinner(self):
         """ hide the spinner page again and show the content page """
 
=== modified file 'tests/gtk3/test_recommendations_widgets.py'
--- tests/gtk3/test_recommendations_widgets.py	2012-05-30 18:39:55 +0000
+++ tests/gtk3/test_recommendations_widgets.py	2012-09-19 07:42:38 +0000
@@ -1,5 +1,10 @@
 import unittest
 
+from gi.repository import (
+    GObject,
+    Gtk,
+    )
+
 from tests.utils import setup_test_env
 setup_test_env()
 
@@ -9,19 +14,31 @@
 # FIXME: the code from test_catview that tests the lobby widget should
 #        move here as it should be fine to test it in isolation
 
+TIMEOUT=300
 class TestRecommendationsWidgets(unittest.TestCase):
 
+    def _on_size_allocate(self, widget, allocation):
+        print widget, allocation.width, allocation.height
+
     def test_recommendations_lobby(self):
         win = get_test_window_recommendations(panel_type="lobby")
+        child = win.get_children()[0]
+        child.connect("size-allocate", self._on_size_allocate)
         self.addCleanup(win.destroy)
+        GObject.timeout_add(TIMEOUT, Gtk.main_quit)
+        Gtk.main()
 
     def test_recommendations_category(self):
         win = get_test_window_recommendations(panel_type="category")
         self.addCleanup(win.destroy)
+        GObject.timeout_add(TIMEOUT, Gtk.main_quit)
+        Gtk.main()
 
     def test_recommendations_details(self):
         win = get_test_window_recommendations(panel_type="details")
         self.addCleanup(win.destroy)
+        GObject.timeout_add(TIMEOUT, Gtk.main_quit)
+        Gtk.main()
 
 
 if __name__ == "__main__":
 
=== modified file 'tests/gtk3/test_spinner.py'
--- tests/gtk3/test_spinner.py	2012-08-28 16:34:54 +0000
+++ tests/gtk3/test_spinner.py	2012-09-19 07:42:38 +0000
@@ -99,6 +99,18 @@
         self.assertTrue(self.obj.spinner_view.spinner.get_visible())
         self.assertEqual(self.obj.get_current_page(), self.obj.SPINNER_PAGE)
 
+    def test_show_spinner_twice(self):
+        """The spinner is not hiden/shown if its already visible."""
+        with patch.object(self.obj.spinner_view, "stop_and_hide") as m:
+            with patch.object(spinner.GObject, 'timeout_add',
+                              lambda t,f: f()):
+                self.obj.show_spinner("meep")
+                self.obj.show_spinner("baap")
+            # ensure that it only called the hide once
+            self.assertEqual(m.call_count, 1)
+            # and that it updated the text
+            self.assertEqual(self.obj.spinner_view.get_text(), "baap")
+
     def test_show_spinner_with_msg(self):
         """The spinner is shown with the given message."""
         message = 'Something I want to show'
 
=== modified file 'tests/gtk3/windows.py'
--- tests/gtk3/windows.py	2012-09-18 04:37:10 +0000
+++ tests/gtk3/windows.py	2012-09-19 07:42:38 +0000
@@ -386,7 +386,7 @@
         view = recommendations.RecommendationsPanelDetails(
                 db, properties_helper)
 
-    win = get_test_window(child=view)
+    win = get_test_window(child=view, width=600, height=300)
     win.set_data("rec_panel", view)
     return win