Draw borders in popup menus

Author: grulja

style/adwaitahelper.cpp

@@ -575,10 +575,10 @@ void Helper::renderMenuFrame(QPainter *painter, const QRect &rect, const QColor
         painter->setBrush(Qt::NoBrush);
 
     painter->setRenderHint(QPainter::Antialiasing, false);
-    QRect frameRect(rect);
+    QRectF frameRect(rect);
     if (outline.isValid()) {
         painter->setPen(outline);
-        frameRect.adjust(0, 0, -1, -1);
+        frameRect.adjust(0.5, 0.5, -0.5, -0.5);
     } else
         painter->setPen(Qt::NoPen);
 

style/adwaitastyle.cpp

@@ -1271,9 +1271,6 @@ void Style::drawControl(ControlElement element, const QStyleOption *option, QPai
         case CE_MenuBarItem:
             fcn = &Style::drawMenuBarItemControl;
             break;
-        case CE_MenuEmptyArea:
-            fcn = &Style::drawMenuEmptyAreaControl;
-            break;
         case CE_MenuItem:
             fcn = &Style::drawMenuItemControl;
             break;
@@ -4854,21 +4851,6 @@ bool Style::drawMenuBarItemControl(const QStyleOption *option, QPainter *painter
     return true;
 }
 
-bool Style::drawMenuEmptyAreaControl(const QStyleOption *option, QPainter *painter, const QWidget *widget) const
-{
-    if (_isGNOME)
-        painter->setPen(Qt::transparent);
-    else
-        painter->setPen(option->palette.window().color().darker(150));
-
-    painter->setBrush(option->palette.base().color());
-    if (_isGNOME)
-        painter->drawRect(option->rect);
-    else
-        painter->drawRect(option->rect.adjusted(0, 0, -1, -1));
-    return true;
-}
-
 //___________________________________________________________________________________
 bool Style::drawMenuItemControl(const QStyleOption *option, QPainter *painter, const QWidget *widget) const
 {
@@ -4882,11 +4864,6 @@ bool Style::drawMenuItemControl(const QStyleOption *option, QPainter *painter, c
     // copy rect and palette
     const QRect &rect(option->rect);
     const QPalette &palette(option->palette);
-    const QColor &background(palette.color(QPalette::Active, QPalette::Base));
-
-    painter->setPen(Qt::NoPen);
-    painter->setBrush(background);
-    painter->drawRect(rect);
 
     // deal with separators
     if (menuItemOption->menuItemType == QStyleOptionMenuItem::Separator) {

style/adwaitastyle.h

@@ -312,7 +312,6 @@ protected Q_SLOTS:
     virtual bool drawItemViewItemControl(const QStyleOption *option, QPainter *painter, const QWidget *widget) const;
     virtual bool drawMenuBarEmptyArea(const QStyleOption *option, QPainter *painter, const QWidget *widget) const;
     virtual bool drawMenuBarItemControl(const QStyleOption *option, QPainter *painter, const QWidget *widget) const;
-    virtual bool drawMenuEmptyAreaControl(const QStyleOption *option, QPainter *painter, const QWidget *widget) const;
     virtual bool drawMenuItemControl(const QStyleOption *option, QPainter *painter, const QWidget *widget) const;
     virtual bool drawProgressBarControl(const QStyleOption *option, QPainter *painter, const QWidget *widget) const;
     virtual bool drawProgressBarContentsControl(const QStyleOption *option, QPainter *painter, const QWidget *widget) const;