diff options
author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-03-21 13:35:35 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-03-21 20:00:45 +0000 |
commit | bef038177298134583775906933f8ce736905f39 (patch) | |
tree | a8fde926c8f348e8aaab89f39f5465b566800bd9 /src/imports/controls/universal/RangeSlider.qml | |
parent | d8d029ccc641dc4151b6fa998ebd415930835094 (diff) |
Remove RangeSlider::track in favor of Control::background
In the series of minimalizing the delegate APIs.
Change-Id: I11e519f5226bf44d18b42fd31276c5528b18ec46
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/universal/RangeSlider.qml')
-rw-r--r-- | src/imports/controls/universal/RangeSlider.qml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/imports/controls/universal/RangeSlider.qml b/src/imports/controls/universal/RangeSlider.qml index f01c06ed..c9dfc8d0 100644 --- a/src/imports/controls/universal/RangeSlider.qml +++ b/src/imports/controls/universal/RangeSlider.qml @@ -42,11 +42,11 @@ T.RangeSlider { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, - Math.max(track ? track.implicitWidth : 0, + Math.max(background ? background.implicitWidth : 0, first.handle ? first.handle.implicitWidth : 0, second.handle ? second.handle.implicitWidth : 0) + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, - Math.max(track ? track.implicitHeight : 0, + Math.max(background ? background.implicitHeight : 0, first.handle ? first.handle.implicitHeight : 0, second.handle ? second.handle.implicitHeight : 0) + topPadding + bottomPadding) @@ -82,8 +82,8 @@ T.RangeSlider { } //! [secondHandle] - //! [track] - track: Item { + //! [background] + background: Item { implicitWidth: horizontal ? 200 : 18 implicitHeight: horizontal ? 18 : 200 @@ -99,8 +99,8 @@ T.RangeSlider { Rectangle { x: parent.horizontal ? 0 : (parent.width - width) / 2 y: parent.horizontal ? (parent.height - height) / 2 : 0 - width: parent.horizontal ? parent.width : 2 // SliderTrackThemeHeight - height: !parent.horizontal ? parent.height : 2 // SliderTrackThemeHeight + width: parent.horizontal ? parent.width : 2 // SliderBackgroundThemeHeight + height: !parent.horizontal ? parent.height : 2 // SliderBackgroundThemeHeight color: control.enabled ? control.Universal.baseMediumLowColor : control.Universal.chromeDisabledHighColor } @@ -108,11 +108,11 @@ T.RangeSlider { Rectangle { x: parent.horizontal ? control.first.position * parent.width : 0 y: parent.horizontal ? (parent.height - height) / 2 : control.second.visualPosition * parent.height - width: parent.horizontal ? control.second.position * parent.width - control.first.position * parent.width : 2 // SliderTrackThemeHeight - height: !parent.horizontal ? control.second.position * parent.height - control.first.position * parent.height : 2 // SliderTrackThemeHeight + width: parent.horizontal ? control.second.position * parent.width - control.first.position * parent.width : 2 // SliderBackgroundThemeHeight + height: !parent.horizontal ? control.second.position * parent.height - control.first.position * parent.height : 2 // SliderBackgroundThemeHeight color: control.enabled ? control.Universal.accent : control.Universal.chromeDisabledHighColor } } - //! [track] + //! [background] } |