qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update Material SpinBox to Material 3 

Fixes: QTBUG-111888
Pick-to: 6.5
Change-Id: I239cde2ed258914692354e54e394036d914548e6
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
This commit is contained in:
Mitch Curtis 2023-03-13 12:13:51 +08:00
parent 846a4ebf26
commit ed2710466b
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/quickcontrols/material/SpinBox.qml
View File

@ -17,8 +17,8 @@ T.SpinBox {
up.implicitIndicatorHeight, down.implicitIndicatorHeight) up.implicitIndicatorHeight, down.implicitIndicatorHeight)
spacing: 6 spacing: 6
topPadding: 8 topPadding: Material.textFieldVerticalPadding
bottomPadding: 16 bottomPadding: Material.textFieldVerticalPadding
leftPadding: control.mirrored ? (up.indicator ? up.indicator.width : 0) : (down.indicator ? down.indicator.width : 0) leftPadding: control.mirrored ? (up.indicator ? up.indicator.width : 0) : (down.indicator ? down.indicator.width : 0)
rightPadding: control.mirrored ? (down.indicator ? down.indicator.width : 0) : (up.indicator ? up.indicator.width : 0) rightPadding: control.mirrored ? (down.indicator ? down.indicator.width : 0) : (up.indicator ? up.indicator.width : 0)
@ -107,16 +107,14 @@ T.SpinBox {
} }
} }
background: Item { background: MaterialTextContainer {
implicitWidth: 192 implicitWidth: 140
implicitHeight: control.Material.touchTarget implicitHeight: control.Material.textFieldHeight
Rectangle { outlineColor: (enabled && control.hovered) ? control.Material.primaryTextColor : control.Material.hintTextColor
x: parent.width / 2 - width / 2 focusedOutlineColor: control.Material.accentColor
y: parent.y + parent.height - height - control.bottomPadding / 2 controlHasActiveFocus: control.activeFocus
width: control.availableWidth controlHasText: true
height: control.activeFocus ? 2 : 1 horizontalPadding: control.Material.textFieldHorizontalPadding
color: control.activeFocus ? control.Material.accentColor : control.Material.hintTextColor
}
} }
} }