diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-06-12 22:36:41 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-06-13 11:00:44 +0000 |
| commit | 058e3946dfbef24309515d27c985048866b69fc9 (patch) | |
| tree | 02cb6becf74dbcb562a94fe22ed768e6c80fda17 /src/imports/controls/universal/RangeSlider.qml | |
| parent | b17cf27b1afd5045aa6bce923f9eebc439d4fc39 (diff) | |
Sliders: fix implicit size calculations
Background size was in the bindings twice: once without and once with
paddings.
Change-Id: I863d1fe29f1d79017bad410b31f961e4d1238e3b
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/universal/RangeSlider.qml')
| -rw-r--r-- | src/imports/controls/universal/RangeSlider.qml | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/imports/controls/universal/RangeSlider.qml b/src/imports/controls/universal/RangeSlider.qml index fd220521..ec2ff7c8 100644 --- a/src/imports/controls/universal/RangeSlider.qml +++ b/src/imports/controls/universal/RangeSlider.qml @@ -42,13 +42,11 @@ T.RangeSlider { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, - Math.max(background ? background.implicitWidth : 0, - first.handle ? first.handle.implicitWidth : 0, - second.handle ? second.handle.implicitWidth : 0) + leftPadding + rightPadding) + Math.max(first.handle ? first.handle.implicitWidth : 0, + second.handle ? second.handle.implicitWidth : 0) + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, - Math.max(background ? background.implicitHeight : 0, - first.handle ? first.handle.implicitHeight : 0, - second.handle ? second.handle.implicitHeight : 0) + topPadding + bottomPadding) + Math.max(first.handle ? first.handle.implicitHeight : 0, + second.handle ? second.handle.implicitHeight : 0) + topPadding + bottomPadding) padding: 6 |