Merge lp:~mvo/software-center/lp1034894-again into lp:software-center

[Michael Vogt]

This branch fixes bug #1034894 by putting the Gtk.STYLE_CLASS_LINKED
info on the right widget

[Gary Lasker (gary-lasker)]

Hi Michael, this looks good, thanks for fixing this fix.

review: Approve

=== modified file 'softwarecenter/ui/gtk3/widgets/backforward.py'
--- softwarecenter/ui/gtk3/widgets/backforward.py	2012-08-29 20:45:07 +0000
+++ softwarecenter/ui/gtk3/widgets/backforward.py	2012-09-17 14:53:43 +0000
@@ -38,6 +38,9 @@
     def __init__(self, part_size=None):
         Gtk.HBox.__init__(self)
 
+        context = self.get_style_context()
+        context.add_class(Gtk.STYLE_CLASS_LINKED)
+
         atk_obj = self.get_accessible()
         atk_obj.set_name(_('History Navigation'))
         atk_obj.set_description(_('Navigate forwards and backwards.'))
@@ -59,14 +62,6 @@
             self.right = ButtonPart('right-clicked',
                 arrow_type=Gtk.ArrowType.RIGHT)
 
-            context = self.left.get_style_context()
-            context.add_class("backforward-left-button")
-            context.add_class(Gtk.STYLE_CLASS_LINKED)
-
-            context = self.right.get_style_context()
-            context.add_class("backforward-right-button")
-            context.add_class(Gtk.STYLE_CLASS_LINKED)
-
             self.set_button_atk_info_ltr()
         else:
             # rtl

=== modified file 'tests/gtk3/test_widgets.py'
--- tests/gtk3/test_widgets.py	2012-08-20 09:09:45 +0000
+++ tests/gtk3/test_widgets.py	2012-09-17 14:53:43 +0000
@@ -59,6 +59,15 @@
         win = get_test_backforward_window()
         self.addCleanup(win.destroy)
 
+    def test_backforward_lp1034894(self):
+        win = get_test_backforward_window(width=150, height=75)
+        backforward = win.get_children()[0]
+        style_context = backforward.get_style_context()
+        self.assertTrue(style_context.has_class(Gtk.STYLE_CLASS_LINKED))
+        self.addCleanup(win.destroy)
+        GObject.timeout_add(TIMEOUT, Gtk.main_quit)
+        Gtk.main()
+
     def test_containers(self):
         win = get_test_container_window()
         self.addCleanup(win.destroy)

=== modified file 'tests/gtk3/windows.py'
--- tests/gtk3/windows.py	2012-09-05 20:53:30 +0000
+++ tests/gtk3/windows.py	2012-09-17 14:53:43 +0000
@@ -563,9 +563,9 @@
     return win
 
 
-def get_test_backforward_window():
+def get_test_backforward_window(*args, **kwargs):
     backforward_button = backforward.BackForwardButton()
-    win = get_test_window(child=backforward_button)
+    win = get_test_window(child=backforward_button, *args, **kwargs)
     return win