diff options
author | Richard Moe Gustavsen <richard.gustavsen@qt.io> | 2020-09-24 16:53:22 +0200 |
---|---|---|
committer | Richard Moe Gustavsen <richard.gustavsen@qt.io> | 2020-09-25 10:45:33 +0200 |
commit | 24eefa0bbb3fd3acd5277c8e8d0e39f4b3a12a72 (patch) | |
tree | 1d42340a609534277326966b6036f6d5ad60d874 /src/imports/controls/macos/SpinBox.qml | |
parent | 09cad0df0d2e13d966766c2f276e01e708be1950 (diff) |
NativeStyle: rename 'nativeBackground' to '__nativeBackground'
Since all properties that we add to the QML style files will
bleed into the API of the control, prepend '__' to
nativeBackground to mark it as private.
Change-Id: I0cb474e054c3a3824985cf39b4bb675fb57b0696
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/macos/SpinBox.qml')
-rw-r--r-- | src/imports/controls/macos/SpinBox.qml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/imports/controls/macos/SpinBox.qml b/src/imports/controls/macos/SpinBox.qml index 23083087..1eb7fa05 100644 --- a/src/imports/controls/macos/SpinBox.qml +++ b/src/imports/controls/macos/SpinBox.qml @@ -41,11 +41,11 @@ import QtQuick.NativeStyle as NativeStyle T.SpinBox { id: control - property bool nativeBackground: background instanceof NativeStyle.StyleItem + property bool __nativeBackground: background instanceof NativeStyle.StyleItem property bool nativeIndicators: up.indicator.hasOwnProperty("_qt_default") && down.indicator.hasOwnProperty("_qt_default") - font.pixelSize: nativeBackground ? background.styleFont(control).pixelSize : undefined + font.pixelSize: __nativeBackground ? background.styleFont(control).pixelSize : undefined implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, 90 /* minimum */ ) @@ -57,10 +57,10 @@ T.SpinBox { // Push the background right to make room for the indicators rightInset: nativeIndicators ? up.implicitIndicatorWidth + spacing : 0 - leftPadding: nativeBackground ? background.contentPadding.left: 0 - topPadding: nativeBackground ? background.contentPadding.top: 0 - rightPadding: (nativeBackground ? background.contentPadding.right : 0) + rightInset - bottomPadding: nativeBackground ? background.contentPadding.bottom: 0 + leftPadding: __nativeBackground ? background.contentPadding.left: 0 + topPadding: __nativeBackground ? background.contentPadding.top: 0 + rightPadding: (__nativeBackground ? background.contentPadding.right : 0) + rightInset + bottomPadding: __nativeBackground ? background.contentPadding.bottom: 0 validator: IntValidator { locale: control.locale.name |