From a0dccdd0ac7be39d8cdb8aa1f12c1771b11213ae Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig <jens.bache-wiig@digia.com> Date: Mon, 3 Mar 2014 14:28:35 +0100 Subject: [PATCH] Fix gray SpinBox background on mac This is a regression caused by removing the fillrect for SpinBoxStyle itself. Change-Id: Ibab509634a12aec591d2d031a0e735d602b388c6 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> --- src/controls/Private/qquickstyleitem.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/controls/Private/qquickstyleitem.cpp b/src/controls/Private/qquickstyleitem.cpp index 21de9819c..5b7e67284 100644 --- a/src/controls/Private/qquickstyleitem.cpp +++ b/src/controls/Private/qquickstyleitem.cpp @@ -1534,6 +1534,15 @@ void QQuickStyleItem::paint(QPainter *painter) painter->setPen(pen); } break; case SpinBox: +#ifdef Q_OS_MAC + // macstyle depends on the embedded qlineedit to fill the editfield background + if (style() == "mac") { + QRect editRect = qApp->style()->subControlRect(QStyle::CC_SpinBox, + qstyleoption_cast<QStyleOptionComplex*>(m_styleoption), + QStyle::SC_SpinBoxEditField); + painter->fillRect(editRect.adjusted(-1, -1, 1, 1), m_styleoption->palette.base()); + } +#endif qApp->style()->drawComplexControl(QStyle::CC_SpinBox, qstyleoption_cast<QStyleOptionComplex*>(m_styleoption), painter); -- GitLab