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

[Kiwinote]

this branch causes the channel selector menus to be themed natively (ie orange on hover etc) - also a few pixel tweaks

[Michael Vogt (mvo)]

Thanks a bunch for this fix! It looks very good (and sorry for the delay in the review :/

review: Approve

=== modified file 'data/ui/gtk3/css/softwarecenter.css'
--- data/ui/gtk3/css/softwarecenter.css	2012-02-09 14:42:20 +0000
+++ data/ui/gtk3/css/softwarecenter.css	2012-02-20 16:04:18 +0000
@@ -79,3 +79,7 @@
     border-width: 0;
     padding: 0;
 }
+
+#toolbar-popup {
+    padding: 0;
+}

=== modified file 'debian/changelog'
--- debian/changelog	2012-02-16 20:30:38 +0000
+++ debian/changelog	2012-02-20 16:04:18 +0000
@@ -11,13 +11,12 @@
       with the latest debtags upstream plans
 
   [ Kiwinote ]
-  * softwarecenter/ui/gtk3/widgets/buttons.py:
-    - draw the backgrounds of the channel selector menus (LP: #921477)
   * softwarecenter/ui/gtk3/app.py:
     - disable navigating back by pressing the backspace key because it has
       started showing dodgy side effects - use ctrl+[ or alt+LEFT instead
   * remember the scroll position when navigating back to a list view,
     this only works in the available pane (LP: #852763)
+  * correctly theme the channel selector menus (LP: #921477)
 
  -- Kiwinote <[e-mail]>  Thu, 16 Feb 2012 14:08:17 +0000
 

=== modified file 'softwarecenter/ui/gtk3/panes/viewswitcher.py'
--- softwarecenter/ui/gtk3/panes/viewswitcher.py	2011-10-16 16:21:39 +0000
+++ softwarecenter/ui/gtk3/panes/viewswitcher.py	2012-02-20 16:04:18 +0000
@@ -237,7 +237,7 @@
             label = Gtk.Label.new(channel.display_name)
             image = Gtk.Image.new_from_icon_name(channel.icon, Gtk.IconSize.MENU)
 
-            box = Gtk.Box.new(Gtk.Orientation.HORIZONTAL, StockEms.MEDIUM)
+            box = Gtk.Box.new(Gtk.Orientation.HORIZONTAL, StockEms.SMALL)
             box.pack_start(image, False, False, 0)
             box.pack_start(label, False, False, 0)
 

=== modified file 'softwarecenter/ui/gtk3/widgets/buttons.py'
--- softwarecenter/ui/gtk3/widgets/buttons.py	2012-02-16 20:18:16 +0000
+++ softwarecenter/ui/gtk3/widgets/buttons.py	2012-02-20 16:04:18 +0000
@@ -436,7 +436,7 @@
             else:
                 tmpx = a.x + a.width - self.popup.get_allocation().width
             x, y = window.get_root_coords(tmpx,
-                                          a.y + a.height + 1)
+                                          a.y + a.height)
             return (x, y, False)
 
         a = self.section_button.get_allocation()
@@ -451,18 +451,9 @@
 
     def build_channel_selector(self):
         self.popup = Gtk.Menu()
+        self.popup.set_name('toolbar-popup')  # to set 'padding: 0;'
+        self.popup.get_style_context().add_class('primary-toolbar')
         self.build_func(self.popup)
-        self.popup.attach_to_widget(self, None)
-        # draw themed bg for the popup menu to workaround bug
-        #  #921477 - that looks like its actually a theme bug
-        context = self.get_ancestor('GtkToolbar').get_style_context()
-        color = context.get_border_color(Gtk.StateFlags.ACTIVE)
-        def draw(widget, cr):
-            a = widget.get_allocation()
-            cr.set_source_rgba(color.red, color.green, color.blue, color.alpha)
-            cr.rectangle(0, 0, a.width, a.height)
-            cr.fill()
-        self.popup.connect('draw', draw)
         return