diff options
| -rw-r--r-- | src/controls/SpinBox.qml | 21 | ||||
| -rw-r--r-- | src/controls/Styles/Base/SpinBoxStyle.qml | 25 | ||||
| -rw-r--r-- | src/controls/Styles/Desktop/SpinBoxStyle.qml | 10 |
3 files changed, 44 insertions, 12 deletions
diff --git a/src/controls/SpinBox.qml b/src/controls/SpinBox.qml index b062ffe5..d2a679c4 100644 --- a/src/controls/SpinBox.qml +++ b/src/controls/SpinBox.qml @@ -140,6 +140,23 @@ Control { */ property bool activeFocusOnPress: true + /*! \qmlproperty enumeration horizontalAlignment + \since 5.2 + + This property indicates how the content is horizontally aligned + within the text field. + + The supported values are: + \list + \li Qt.AlignLeft + \li Qt.AlignHCenter + \li Qt.AlignRight + \endlist + + The default value is style dependent. + */ + property int horizontalAlignment: __panel ? __panel.horizontalAlignment : Qt.AlignLeft + /*! \qmlproperty bool SpinBox::hovered @@ -223,8 +240,8 @@ Control { focus: true activeFocusOnPress: spinbox.activeFocusOnPress - horizontalAlignment: __panel ? __panel.horizontalTextAlignment : Qt.AlignLeft - verticalAlignment: __panel ? __panel.verticalTextAlignment : Qt.AlignVCenter + horizontalAlignment: spinbox.horizontalAlignment + verticalAlignment: __panel ? __panel.verticalAlignment : Qt.AlignVCenter selectByMouse: true validator: SpinBoxValidator { diff --git a/src/controls/Styles/Base/SpinBoxStyle.qml b/src/controls/Styles/Base/SpinBoxStyle.qml index a983efbe..1d18627c 100644 --- a/src/controls/Styles/Base/SpinBoxStyle.qml +++ b/src/controls/Styles/Base/SpinBoxStyle.qml @@ -76,7 +76,22 @@ Style { } /*! The content margins of the text field. */ - padding { top: 0 ; left: 5 ; right: 12 ; bottom: 0 } + padding { top: 0 ; left: 5 ; right: 18 ; bottom: 0 } + + /*! \qmlproperty enumeration horizontalAlignment + + This property defines the default text aligment. + + The supported values are: + \list + \li Qt.AlignLeft + \li Qt.AlignHCenter + \li Qt.AlignRight + \endlist + + The default value is Qt.AlignRight + */ + property int horizontalAlignment: Qt.AlignRight /*! The text color. */ property color textColor: __syspal.text @@ -114,7 +129,7 @@ Style { /*! The background of the SpinBox. */ property Component background: Item { implicitHeight: 25 - implicitWidth: 80 + implicitWidth: styleData.contentWidth + 26 BorderImage { id: image anchors.fill: parent @@ -143,7 +158,7 @@ Style { /*! \internal */ property Component panel: Item { id: styleitem - implicitWidth: styleData.contentWidth + 26 + implicitWidth: backgroundLoader.implicitWidth implicitHeight: backgroundLoader.implicitHeight property color foregroundColor: spinboxStyle.textColor @@ -155,8 +170,8 @@ Style { property rect upRect: Qt.rect(width - incrementControlLoader.implicitWidth, 0, incrementControlLoader.implicitWidth, height / 2 + 1) property rect downRect: Qt.rect(width - decrementControlLoader.implicitWidth, height / 2, decrementControlLoader.implicitWidth, height / 2) - property int horizontalTextAlignment: Qt.AlignLeft - property int verticalTextAlignment: Qt.AlignVCenter + property int horizontalAlignment: spinboxStyle.horizontalAlignment + property int verticalAlignment: Qt.AlignVCenter Loader { id: backgroundLoader diff --git a/src/controls/Styles/Desktop/SpinBoxStyle.qml b/src/controls/Styles/Desktop/SpinBoxStyle.qml index 7e190370..fe374fe9 100644 --- a/src/controls/Styles/Desktop/SpinBoxStyle.qml +++ b/src/controls/Styles/Desktop/SpinBoxStyle.qml @@ -63,8 +63,8 @@ Style { property rect upRect property rect downRect - property int horizontalTextAlignment: Qt.AlignLeft - property int verticalTextAlignment: Qt.AlignVCenter + property int horizontalAlignment: Qt.platform.os === "osx" ? Qt.AlignRight : Qt.AlignLeft + property int verticalAlignment: Qt.AlignVCenter property color foregroundColor: __syspal.text property color backgroundColor: __syspal.base @@ -72,14 +72,14 @@ Style { property color selectedTextColor: __syspal.highlightedText property int topPadding: edit.anchors.topMargin - property int leftPadding: 2 + edit.anchors.leftMargin - property int rightPadding: 2 + edit.anchors.leftMargin + property int leftPadding: 3 + edit.anchors.leftMargin + property int rightPadding: 3 + edit.anchors.rightMargin property int bottomPadding: edit.anchors.bottomMargin width: 100 height: styleitem.implicitHeight - implicitWidth: styleitem.implicitWidth + implicitWidth: 2 + styleitem.implicitWidth implicitHeight: styleitem.implicitHeight baselineOffset: styleitem.baselineOffset |