diff options
Diffstat (limited to 'src/styles/Desktop/SpinBoxStyle.qml')
| -rw-r--r-- | src/styles/Desktop/SpinBoxStyle.qml | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/styles/Desktop/SpinBoxStyle.qml b/src/styles/Desktop/SpinBoxStyle.qml index 2da3db1f..24f51427 100644 --- a/src/styles/Desktop/SpinBoxStyle.qml +++ b/src/styles/Desktop/SpinBoxStyle.qml @@ -41,7 +41,7 @@ import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Private 1.0 -PaddedStyle { +Style { readonly property SpinBox control: __control property var __syspal: SystemPalette { @@ -50,11 +50,12 @@ PaddedStyle { } padding { - top: control.__panel ? control.__panel.topPadding + (control.__panel.style === "mac" ? 1 : 0) : 0 + top: control.__panel ? control.__panel.topPadding + (styleitem.style === "mac" ? 2 : 0) : 0 left: control.__panel ? control.__panel.leftPadding : 0 right: control.__panel ? control.__panel.rightPadding : 0 bottom: control.__panel ? control.__panel.bottomPadding : 0 } + StyleItem {id: styleitem ; visible: false} property Component panel: Item { id: style @@ -114,17 +115,17 @@ PaddedStyle { id: styleitem elementType: "spinbox" anchors.fill: parent - sunken: (controlState.downEnabled && controlState.downPressed) || (controlState.upEnabled && controlState.upPressed) - hover: controlState.containsMouse + sunken: (styleData.downEnabled && styleData.downPressed) || (styleData.upEnabled && styleData.upPressed) + hover: control.hovered hints: control.styleHints hasFocus: control.activeFocus enabled: control.enabled - value: (controlState.upPressed ? 1 : 0) | - (controlState.downPressed ? 1<<1 : 0) | - (controlState.upEnabled ? (1<<2) : 0) | - (controlState.downEnabled ? (1<<3) : 0) - contentWidth: controlState.contentWidth - contentHeight: controlState.contentHeight + value: (styleData.upPressed ? 1 : 0) | + (styleData.downPressed ? 1<<1 : 0) | + (styleData.upEnabled ? (1<<2) : 0) | + (styleData.downEnabled ? (1<<3) : 0) + contentWidth: styleData.contentWidth + contentHeight: styleData.contentHeight } } } |