Merge lp:~larsu/ubuntu-themes/fix-separators into lp:ubuntu-themes

[Lars Karlitski]

Don't use GtkWidget-wide-separators

There are two code paths in gtk for drawing menu separators. The one we were
using (which is able to draw fancy rectangles) uses css border properties. In
gtk 3.8, menu items honor the border property, so we get a border around every
separator.

This patch makes it use the other code path, which draws a simple line. It
also removes borders.

Don't use GtkWidget-wide-separators

There are two code paths in gtk for drawing menu separators. The one we were
using (which is able to draw fancy rectangles) uses css border properties. In
gtk 3.8, menu items honor the border property, so we get a border around every
separator.

This patch makes it use the other code path, which draws a simple line. It
also removes borders.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:277
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~larsu/ubuntu-themes/fix-separators/+merge/151330/+edit-commit-message

http://s-jenkins:8080/job/ubuntu-themes-ci/1/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/ubuntu-themes-ci/./build=pbuilder,distribution=raring,flavor=amd64/1/console
    SUCCESS: http://s-jenkins:8080/job/ubuntu-themes-ci/./build=pbuilder,distribution=raring,flavor=armhf/1/console
    SUCCESS: http://s-jenkins:8080/job/ubuntu-themes-ci/./build=pbuilder,distribution=raring,flavor=i386/1/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-themes-ci/1//rebuild/?

review: Needs Fixing (continuous-integration)

[Michael Terry (mterry)]

Works for me in both GTK+ 3.6 and 3.7.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'Ambiance/gtk-3.0/gtk-widgets.css'
--- Ambiance/gtk-3.0/gtk-widgets.css	2013-02-19 13:06:53 +0000
+++ Ambiance/gtk-3.0/gtk-widgets.css	2013-03-01 23:41:20 +0000
@@ -44,7 +44,6 @@
     -GtkToolbar-internal-padding: 0;
     -GtkTreeView-expander-size: 8;
     -GtkTreeView-vertical-separator: 0;
-    -GtkWidget-wide-separators: true;
     -GtkWidget-separator-width: 2;
     -GtkWidget-separator-height: 2;
     -GtkWidget-focus-padding: 0;
@@ -1567,6 +1566,8 @@
 
 .menuitem.separator {
     -GtkMenuItem-horizontal-padding: 0;
+    border: none;
+    color: @dark_bg_color;
 }
 
 GtkTreeMenu .menuitem.separator,

=== modified file 'Radiance/gtk-3.0/gtk-widgets.css'
--- Radiance/gtk-3.0/gtk-widgets.css	2013-02-19 13:06:53 +0000
+++ Radiance/gtk-3.0/gtk-widgets.css	2013-03-01 23:41:20 +0000
@@ -44,7 +44,6 @@
     -GtkToolbar-internal-padding: 0;
     -GtkTreeView-expander-size: 8;
     -GtkTreeView-vertical-separator: 0;
-    -GtkWidget-wide-separators: true;
     -GtkWidget-separator-width: 2;
     -GtkWidget-separator-height: 2;
     -GtkWidget-focus-padding: 0;
@@ -1567,6 +1566,8 @@
 
 .menuitem.separator {
     -GtkMenuItem-horizontal-padding: 0;
+    border: none;
+    color: @dark_bg_color;
 }
 
 GtkTreeMenu .menuitem.separator,