Merge lp:~agateau/unity-2d/no-frame-around-disabled-menubar-items into lp:unity-2d/3.0

[Aurélien Gâteau]

[panel] Do not draw a sunken border behind disabled menubar items

Do not draw a sunken border behind disabled menubar items

Apps such as Deluge should be fixed: it is against the GNOME HIG to have disabled items in a menubar. Nevertheless, let's not look ugly because of broken apps.

=== modified file 'panel/app/unity2dstyle.cpp'
--- panel/app/unity2dstyle.cpp	2011-02-02 16:57:00 +0000
+++ panel/app/unity2dstyle.cpp	2011-03-28 12:33:33 +0000
@@ -43,8 +43,14 @@
 void Unity2dStyle::drawControl(QStyle::ControlElement element, const QStyleOption* option, QPainter* painter, const QWidget* widget) const
 {
     if (element == QStyle::CE_MenuBarItem && widget) {
-        // Avoid solid gray background behind the menubar items
-        QProxyStyle::drawControl(element, option, painter, 0);
+        QStyleOptionMenuItem opt = *qstyleoption_cast<const QStyleOptionMenuItem*>(option);
+        if (!(opt.state & QStyle::State_Enabled) && (opt.state & QStyle::State_Sunken)) {
+            // Reset State_Sunken flag to avoid drawing a frame on a disabled menu item
+            // See https://bugs.launchpad.net/unity-2d/+bug/717744
+            opt.state ^= QStyle::State_Sunken;
+        }
+        // Skip "widget" parameter to avoid solid gray background behind the menubar items
+        QProxyStyle::drawControl(element, &opt, painter, 0);
     } else if (element == QStyle::CE_MenuBarEmptyArea) {
         // Avoid gray borders around the menubar items
     } else {