diff --git a/src/private/qquickstyleitem.cpp b/src/private/qquickstyleitem.cpp index f5e32bba4d20394fe5c8e3b3c1b67f0a2112d12a..cfbb36c890a7a87f18311cc0033ba9c93bc39272 100644 --- a/src/private/qquickstyleitem.cpp +++ b/src/private/qquickstyleitem.cpp @@ -794,7 +794,7 @@ QSize QQuickStyleItem::sizeFromContents(int width, int height) case SpinBox: #ifdef Q_OS_MAC if (style() == "mac") { - size = qApp->style()->sizeFromContents(QStyle::CT_SpinBox, m_styleoption, QSize(width, height + 4)); + size = qApp->style()->sizeFromContents(QStyle::CT_SpinBox, m_styleoption, QSize(width, height + 5)); break; } #endif // fall trough if not mac @@ -804,7 +804,7 @@ QSize QQuickStyleItem::sizeFromContents(int width, int height) if (m_hints.indexOf("small") != -1 || m_hints.indexOf("mini") != -1) size = QSize(width, 19); else - size = QSize(width, 21); + size = QSize(width, 22); } else #endif { diff --git a/src/styles/Desktop/SpinBoxStyle.qml b/src/styles/Desktop/SpinBoxStyle.qml index 227a6e7c2c786bd57b413f7ea90138cd32f512fa..2da3db1f29417e2df8e9e0f93393f37a5ec1bca7 100644 --- a/src/styles/Desktop/SpinBoxStyle.qml +++ b/src/styles/Desktop/SpinBoxStyle.qml @@ -50,7 +50,7 @@ PaddedStyle { } padding { - top: control.__panel ? control.__panel.topPadding : 0 + top: control.__panel ? control.__panel.topPadding + (control.__panel.style === "mac" ? 1 : 0) : 0 left: control.__panel ? control.__panel.leftPadding : 0 right: control.__panel ? control.__panel.rightPadding : 0 bottom: control.__panel ? control.__panel.bottomPadding : 0 @@ -100,7 +100,7 @@ PaddedStyle { style.upRect = styleitem.subControlRect("up"); style.downRect = styleitem.subControlRect("down"); var inputRect = styleitem.subControlRect("edit"); - edit.anchors.topMargin = inputRect.y + (styleitem.style === "mac" ? 1 : 0) + edit.anchors.topMargin = inputRect.y edit.anchors.leftMargin = inputRect.x edit.anchors.rightMargin = style.width - inputRect.width - edit.anchors.leftMargin edit.anchors.bottomMargin = style.height - inputRect.height - edit.anchors.topMargin