summaryrefslogtreecommitdiff
path: root/src/styles
diff options
context:
space:
mode:
authorJens Bache-Wiig <jens.bache-wiig@digia.com>2013-05-27 10:57:10 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-05-27 11:37:06 +0200
commitbcf132fb54b4b1c9ba3ade31c134a521b361ab62 (patch)
tree9aa7277b57ac9250583cf9ba075adc2543a628cd /src/styles
parentd2410a5ba10df46f7c2ba66db63815ede0ef2320 (diff)
downloadqtquickcontrols-bcf132fb54b4b1c9ba3ade31c134a521b361ab62.tar.gz
Pixel adjustment on mac
Made the SpinBox and TextField 22 px on mac. Fixed internal offset. Change-Id: I36964048415dfedb3db0fac65fb8c1b710ea226f Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src/styles')
-rw-r--r--src/styles/Desktop/SpinBoxStyle.qml4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/styles/Desktop/SpinBoxStyle.qml b/src/styles/Desktop/SpinBoxStyle.qml
index 227a6e7c..2da3db1f 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