Ticket #50183: patch-qt5-fix-appearance.diff

qt5/style/qtcurve.cpp

@@ -98 +98 @@
 
 namespace QtCurve {
 
+static inline void setPainterPen(QPainter *p, const QColor &col, const qreal width=1.0)
+{
+    p->setPen(QPen(col, width));
+}
+
 static Style::Icon
 pix2Icon(QStyle::StandardPixmap pix)
 {
@@ -1193 +1198 @@
         if(fadeSizeEnd>=0 && fadeSizeEnd<=1.0)
             grad.setColorAt(1.0-fadeSizeEnd, col);
         grad.setColorAt(1, fadeEnd && opts.fadeLines ? fade : col);
-        p->setPen(QPen(QBrush(grad), 1));
+        p->setPen(QPen(QBrush(grad), QPENWIDTH1));
     }
     else
         p->setPen(col);
@@ -1211 +1216 @@
         x2(r.x()+r.width()-1),
         y2(r.y()+r.height()-1),
         i;
-    QPen dp(cols[dark], 1),
-        lp(cols[0], 1);
+    QPen dp(cols[dark], QPENWIDTH1),
+        lp(cols[0], QPENWIDTH1);
 
     if(opts.fadeLines && (horiz ? r.width() : r.height())>16)
     {
@@ -1225 +1230 @@
         grad.setColorAt(0.6, cols[dark]);
         grad.setColorAt(1, fade);
 
-        dp=QPen(QBrush(grad), 1);
+        dp=QPen(QBrush(grad), QPENWIDTH1);
 
         if(LINE_FLAT!=type)
         {
@@ -1236 +1241 @@
             grad.setColorAt(0.4, cols[0]);
             grad.setColorAt(0.6, cols[0]);
             grad.setColorAt(1, fade);
-            lp=QPen(QBrush(grad), 1);
+            lp=QPen(QBrush(grad), QPENWIDTH1);
         }
     }
 
@@ -1613 +1618 @@
                         round, (int)realRound, pixSize.width(), pixSize.height(),
                         state, fill.rgba(), (int)(radius * 100));
             if (!m_usePixmapCache || !QPixmapCache::find(key, pix)) {
-                const float scale = ((int(pixSize.width() * 1.2) + 1.0) /
-                                     pixSize.width());
-                pix = QPixmap(pixSize * scale);
+                pix = QPixmap(pixSize);
                 pix.fill(Qt::transparent);
 
                 QPainter pixPainter(&pix);
-                pixPainter.scale(scale, scale);
                 ERound oldRound = opts.round;
                 opts.round = realRound;
+                pixPainter.setRenderHint(QPainter::Antialiasing, true);
                 drawLightBevelReal(&pixPainter, QRect(0, 0, pixSize.width(),
                                                       pixSize.height()), option,
                                    widget, round, fill, custom, doBorder, w,
                                    false, realRound, onToolbar);
                 opts.round = oldRound;
                 pixPainter.end();
-                pix = pix.scaled(pixSize);
 
                 if (m_usePixmapCache) {
                     QPixmapCache::insert(key, pix);
@@ -1770 +1772 @@
                         bool horizontal((horiz && WIDGET_SB_BUTTON!=w)|| (!horiz && WIDGET_SB_BUTTON==w)),
                             thin(WIDGET_SB_BUTTON==w || WIDGET_SPIN==w || ((horiz ? r.height() : r.width())<16));
 
-                        p->setPen(m_mouseOverCols[MO_PLASTIK_DARK(w)]);
+                        setPainterPen(p, m_mouseOverCols[MO_PLASTIK_DARK(w)], QPENWIDTH1);
                         if(horizontal)
                         {
                             drawAaLine(p, r.x()+1, r.y()+1, r.x()+r.width()-2, r.y()+1);
@@ -1783 +1785 @@
                         }
                         if(!thin)
                         {
-                            p->setPen(m_mouseOverCols[MO_PLASTIK_LIGHT(w)]);
+                            setPainterPen(p, m_mouseOverCols[MO_PLASTIK_LIGHT(w)], QPENWIDTH1);
                             if(horizontal)
                             {
                                 drawAaLine(p, r.x()+1, r.y()+2, r.x()+r.width()-2, r.y()+2);
@@ -1889 +1891 @@
     }
 
     if (!colouredMouseOver && lightBorder) {
-        p->setPen(cols[LIGHT_BORDER(app)]);
+        setPainterPen(p, cols[LIGHT_BORDER(app)], QPENWIDTH1);
         p->drawPath(buildPath(r, w, round,
                               qtcGetRadius(&opts, r.width(),
                                            r.height(), w, RADIUS_INTERNAL)));
@@ -1901 +1903 @@
         buildSplitPath(r, round, qtcGetRadius(&opts, r.width(), r.height(), w, RADIUS_INTERNAL),
                        innerTlPath, innerBrPath);
 
-        p->setPen(border[colouredMouseOver ? MO_STD_LIGHT(w, sunken) : (sunken ? dark : 0)]);
+        setPainterPen(p, border[colouredMouseOver ? MO_STD_LIGHT(w, sunken) : (sunken ? dark : 0)], QPENWIDTH1);
         p->drawPath(innerTlPath);
         if(colouredMouseOver || bevelledButton || draw3dfull)
         {
-            p->setPen(border[colouredMouseOver ? MO_STD_DARK(w) : (sunken ? 0 : dark)]);
+            setPainterPen(p, border[colouredMouseOver ? MO_STD_DARK(w) : (sunken ? 0 : dark)], QPENWIDTH1);
             p->drawPath(innerBrPath);
         }
     }
@@ -1967 +1969 @@
     col.setAlphaF(GLOW_ALPHA(defShade));
     p->setBrush(Qt::NoBrush);
     p->setRenderHint(QPainter::Antialiasing, true);
-    p->setPen(col);
+    setPainterPen(p, col, QPENWIDTH1);
     p->drawPath(buildPath(r, w, ROUNDED_ALL, qtcGetRadius(&opts, r.width(), r.height(), w, RADIUS_ETCH)));
     p->setRenderHint(QPainter::Antialiasing, QPAINTER_ANTIALIAS_MAYBE_ON);
 }
@@ -1986 +1988 @@
     col.setAlphaF(USE_CUSTOM_ALPHAS(opts) ? opts.customAlphas[ALPHA_ETCH_DARK] : ETCH_TOP_ALPHA);
     p->setBrush(Qt::NoBrush);
     p->setRenderHint(QPainter::Antialiasing, true);
-    p->setPen(col);
+    setPainterPen(p, col, QPENWIDTH1);
 
     if(!raised && WIDGET_SLIDER!=w)
     {
@@ -1995 +1997 @@
         {
             QColor col(Qt::white);
             col.setAlphaF(USE_CUSTOM_ALPHAS(opts) ? opts.customAlphas[ALPHA_ETCH_LIGHT] : ETCH_BOTTOM_ALPHA); // 0.25);
-            p->setPen(col);
+            setPainterPen(p, col, QPENWIDTH1);
         }
         else
-            p->setPen(getLowerEtchCol(widget));
+            setPainterPen(p, getLowerEtchCol(widget), QPENWIDTH1);
     }
 
     p->drawPath(br);
@@ -2012 +2014 @@
     QColor col(Qt::white);
 
     col.setAlphaF(RINGS_INNER_ALPHA(isWindow ? opts.bgndImage.type : opts.menuBgndImage.type));
+    if (width == 1) {
+        width = QPENWIDTH1;
+    }
     painter.setPen(QPen(col, width));
     painter.drawEllipse(QRectF(x+width2, y+width2, size-width, size-width));
 
     if(IMG_BORDERED_RINGS==(isWindow ? opts.bgndImage.type : opts.menuBgndImage.type))
     {
         col.setAlphaF(RINGS_OUTER_ALPHA);
-        painter.setPen(QPen(col, 1));
+        painter.setPen(QPen(col, QPENWIDTH1));
         painter.drawEllipse(QRectF(x, y, size, size));
         if(size2)
             painter.drawEllipse(QRectF(x+width, y+width, size2, size2));
@@ -2048 +2053 @@
         if(100!=opacity)
         {
             col2.setAlphaF(opacity/100.0);
-            pixPainter.setPen(col);
+            pixPainter.setPen(QPen(col, QPENWIDTH1));
             for(int i=0; i<pix.height(); i+=4)
                 pixPainter.drawLine(0, i, pix.width()-1, i);
         }
         else
             pixPainter.fillRect(pix.rect(), col);
-        pixPainter.setPen(QColor((3*col.red()+col2.red())/4,
+        pixPainter.setPen(QPen(QColor((3*col.red()+col2.red())/4,
                                  (3*col.green()+col2.green())/4,
                                  (3*col.blue()+col2.blue())/4,
-                                 100!=opacity ? col2.alpha() : 255));
+                                 100!=opacity ? col2.alpha() : 255), QPENWIDTH1));
 
         for(int i=1; i<pix.height(); i+=4)
         {
             pixPainter.drawLine(0, i, pix.width()-1, i);
             pixPainter.drawLine(0, i+2, pix.width()-1, i+2);
         }
-        pixPainter.setPen(col2);
+        pixPainter.setPen(QPen(col2, QPENWIDTH1));
         for(int i=2; i<pix.height()-1; i+=4)
             pixPainter.drawLine(0, i, pix.width()-1, i);
 
@@ -2554 +2559 @@
 
             buildSplitPath(inner, round, qtcGetRadius(&opts, inner.width(), inner.height(), w, RADIUS_INTERNAL), topPath, botPath);
 
-            p->setPen((enabled || BORDER_SUNKEN==borderProfile) /*&&
+            setPainterPen(p, (enabled || BORDER_SUNKEN==borderProfile) /*&&
                                                                   (BORDER_RAISED==borderProfile || BORDER_LIGHT==borderProfile || hasFocus || APPEARANCE_FLAT!=app)*/
                       ? tl
-                      : option->palette.background().color());
+                      : option->palette.background().color(), QPENWIDTH1);
             p->drawPath(topPath);
             if(WIDGET_SCROLLVIEW==w || // Because of list view headers, need to draw dark line on right!
                (! ( (WIDGET_ENTRY==w && !hasFocus && !hasMouseOver) ||
                     (WIDGET_ENTRY!=w && doBlend && BORDER_SUNKEN==borderProfile) ) ) )
             {
                 if(!hasFocus && !hasMouseOver && BORDER_LIGHT!=borderProfile && WIDGET_SCROLLVIEW!=w)
-                    p->setPen(/*WIDGET_SCROLLVIEW==w && !hasFocus
+                    setPainterPen(p, /*WIDGET_SCROLLVIEW==w && !hasFocus
                                 ? checkColour(option, QPalette::Window)
                                 : WIDGET_ENTRY==w && !hasFocus
                                 ? checkColour(option, QPalette::Base)
                                 : */enabled && (BORDER_SUNKEN==borderProfile || hasFocus || /*APPEARANCE_FLAT!=app ||*/
                                                 WIDGET_TAB_TOP==w || WIDGET_TAB_BOT==w)
                                 ? br
-                                : checkColour(option, QPalette::Window));
+                                : checkColour(option, QPalette::Window), QPENWIDTH1);
                 p->drawPath(botPath);
             }
         }
@@ -2586 +2591 @@
 
         col.setAlphaF(LOWER_BORDER_ALPHA);
         buildSplitPath(r, round, qtcGetRadius(&opts, r.width(), r.height(), w, RADIUS_EXTERNAL), topPath, botPath);
-        p->setPen(/*enabled ? */border/* : col*/);
+        p->setPen(QPen(/*enabled ? */border/* : col*/, QPENWIDTH1));
         p->drawPath(topPath);
 //         if(enabled)
         p->setPen(col);
@@ -2594 +2599 @@
     }
     else
     {
-        p->setPen(border);
+        p->setPen(QPen(border, QPENWIDTH1));
         p->drawPath(buildPath(r, w, round, qtcGetRadius(&opts, r.width(), r.height(), w, RADIUS_EXTERNAL)));
     }
 

qt5/style/qtcurve_api.cpp

@@ -5309 +5309 @@
 
                     grad.setColorAt(0, dark);
                     grad.setColorAt(1, m_backgroundCols[QTC_STD_BORDER]);
-                    painter->setPen(QPen(QBrush(grad), 1));
+                    painter->setPen(QPen(QBrush(grad), QPENWIDTH1));
                     painter->drawLine(r.x(), start.y(), r.x(), end.y());
                     painter->drawLine(r.x()+r.width()-1, start.y(), r.x()+r.width()-1, end.y());
 
@@ -5317 +5317 @@
                     {
                         grad.setColorAt(0, light);
                         grad.setColorAt(1, m_backgroundCols[0]);
-                        painter->setPen(QPen(QBrush(grad), 1));
+                        painter->setPen(QPen(QBrush(grad), QPENWIDTH1));
                         painter->drawLine(r.x()+1, start.y(), r.x()+1, end.y());
                     }
                 }

qt5/style/qtcurve_p.h

@@ -286 +286 @@
 
 }
 
+// allow testing pen widths slightly different from 1 as Qt5 might not anti-alias correctly for width 1
+#define QPENWIDTH1  1
 #define QPAINTER_ANTIALIAS_MAYBE_ON true
 
 #endif

qt5/style/qtcurve_primitive.cpp

@@ -48 +48 @@
 #endif
 
 namespace QtCurve {
+
+static inline void setPainterPen(QPainter *p, const QColor &col, const qreal width=1.0)
+{
+    p->setPen(QPen(col, width));
+}
+
 bool
 Style::drawPrimitiveIndicatorTabClose(PrimitiveElement,
                                       const QStyleOption*option,
@@ -493 +499 @@
                     col.setAlphaF(0.0);
                     grad.setColorAt(1, col);
                     painter->setRenderHint(QPainter::Antialiasing, true);
-                    painter->setPen(QPen(QBrush(grad), 1));
+                    painter->setPen(QPen(QBrush(grad), QPENWIDTH1));
                     painter->drawPath(path);
                 }
                 if (opts.gbLabel & (GB_LBL_INSIDE | GB_LBL_OUTSIDE)) {
@@ -1234 +1240 @@
             path.lineTo(xd + offset + etchOffset, yd + offset + 6 + etchOffset);
             path.lineTo(xd + offset + etchOffset, yd + offset + etchOffset);
             painter->setBrush(cols[isDown ? 0 : 4]);
-            painter->setPen(cols[isDown ? 0 : 4]);
+            setPainterPen(painter, cols[isDown ? 0 : 4], QPENWIDTH1);
             painter->setRenderHint(QPainter::Antialiasing, true);
             painter->drawPath(path);
             painter->setRenderHint(QPainter::Antialiasing, QPAINTER_ANTIALIAS_MAYBE_ON);
@@ -1541 +1547 @@
             if (opts.crSize != CR_SMALL_SIZE && menu) {
                 y -= 2;
             }
+            painter->setRenderHint(QPainter::Antialiasing, true);
             drawLightBevel(painter, rect, &opt, widget, ROUNDED_ALL,
                            getFill(&opt, use, true, false), use, true,
                            WIDGET_RADIO_BUTTON);
@@ -1580 +1587 @@
             painter->setRenderHint(QPainter::Antialiasing, true);
             if (coloredMo) {
                 painter->setBrush(Qt::NoBrush);
-                painter->setPen(use[CR_MO_FILL]);
+                setPainterPen(painter, use[CR_MO_FILL], QPENWIDTH1);
                 painter->drawArc(QRectF(x + 1, y + 1, opts.crSize - 2,
                                         opts.crSize - 2), 0, 360 * 16);
                 painter->drawArc(QRectF(x + 2, y + 2, opts.crSize - 4,
@@ -1593 +1600 @@
                 if (!glow) {
                     topCol.setAlphaF(ETCH_RADIO_TOP_ALPHA);
                 }
-                painter->setPen(topCol);
+                setPainterPen(painter, topCol, QPENWIDTH1);
                 painter->drawArc(QRectF(x - 0.5, y - 0.5, opts.crSize + 1,
                                         opts.crSize + 1), 45 * 16, 180 * 16);
                 if (!glow) {
@@ -1602 +1609 @@
                 painter->drawArc(QRectF(x - 0.5, y - 0.5, opts.crSize + 1,
                                         opts.crSize + 1), 225 * 16, 180 * 16);
             }
-            painter->setPen(use[BORDER_VAL(state & State_Enabled)]);
+            setPainterPen(painter, use[BORDER_VAL(state & State_Enabled)], QPENWIDTH1);
             painter->drawArc(QRectF(x + 0.25, y + 0.25, opts.crSize - 0.5,
                                     opts.crSize - 0.5), 0, 360 * 16);
             if (!coloredMo) {
-                painter->setPen(btn[state & State_MouseOver ? 3 : 4]);
+                setPainterPen(painter, btn[state & State_MouseOver ? 3 : 4], QPENWIDTH1);
                 painter->drawArc(QRectF(x + 0.75, y + 0.75, opts.crSize - 1.5,
                                         opts.crSize - 1.5),
                                  lightBorder ? 0 : 45 * 16,
@@ -1661 +1668 @@
         if (r == QRect(0, 0, 14, 15)) { // OO.o 3.2 =14x15?
             rect.adjust(-1, -1, -1, -1);
         }
-        painter->setPen(option ? option->palette.text().color() :
-                        QApplication::palette().text().color());
+        setPainterPen(painter, option ? option->palette.text().color() :
+                        QApplication::palette().text().color(), QPENWIDTH1);
         drawRect(painter, r);
         // LibreOffice its 15x15 - and arrow is not centred, so adjust this...
         if (r == QRect(0, 0, 15, 15)) {
@@ -1692 +1699 @@
             opt.state &= ~State_On;
             opt.state |= State_Raised;
             opt.rect = rect;
+            painter->setRenderHint(QPainter::Antialiasing, true);
             drawLightBevel(painter, rect, &opt, widget, ROUNDED_ALL,
                            getFill(&opt, use, true, false),
                            use, true, WIDGET_CHECKBOX);
@@ -1721 +1729 @@
 
             if (opts.coloredMouseOver != MO_NONE && !glow && mo) {
                 painter->setRenderHint(QPainter::Antialiasing, true);
-                painter->setPen(use[CR_MO_FILL]);
+                setPainterPen(painter, use[CR_MO_FILL], QPENWIDTH1);
                 drawAaRect(painter, rect.adjusted(1, 1, -1, -1));
                 painter->setRenderHint(QPainter::Antialiasing, QPAINTER_ANTIALIAS_MAYBE_ON);
             } else {
-                painter->setPen(midColor(state & State_Enabled ?
+                setPainterPen(painter, midColor(state & State_Enabled ?
                                          palette.base().color() :
-                                         palette.background().color(), use[3]));
+                                         palette.background().color(), use[3]), QPENWIDTH1);
                 if (lightBorder) {
                     drawRect(painter, rect.adjusted(1, 1, -1, -1));
                 } else {
@@ -1740 +1748 @@
                 }
             }
 
+            painter->setRenderHint(QPainter::Antialiasing, true);
             if (doEtch && !view) {
                 if (glow && !(opts.thin & THIN_FRAMES)) {
                     drawGlow(painter, r, WIDGET_CHECKBOX);
@@ -1751 +1760 @@
             }
             drawBorder(painter, rect, option, ROUNDED_ALL, use,
                        WIDGET_CHECKBOX);
+            painter->setRenderHint(QPainter::Antialiasing, QPAINTER_ANTIALIAS_MAYBE_ON);
         }
     }
     if (state & State_On || selectedOOMenu) {
@@ -1762 +1772 @@
         // tri-state
         int x(rect.center().x()), y(rect.center().y());
 
-        painter->setPen(checkRadioCol(option));
+        setPainterPen(painter, checkRadioCol(option), QPENWIDTH1);
         painter->drawLine(x - 3, y, x + 3, y);
         painter->drawLine(x - 3, y + 1, x + 3, y + 1);
     }