diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-06-14 21:42:20 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-06-14 21:42:20 +0200 |
| commit | bf82b95088f552a5f62d333662c7a9202d293359 (patch) | |
| tree | cd25b2d91c3d98733920f7a8561d41c89731975b /src/imports/controls/universal | |
| parent | 221c3ce846e5a6167aa0b2d356c23d5b9c7e32cb (diff) | |
| parent | 73e722a85fbf0675938023b0207d7daac93b085a (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/quicktemplates2/qquickslider.cpp
Change-Id: Idefd7b77b1937d423ee2db5064ff09c36b240ef0
Diffstat (limited to 'src/imports/controls/universal')
| -rw-r--r-- | src/imports/controls/universal/RangeSlider.qml | 10 | ||||
| -rw-r--r-- | src/imports/controls/universal/Slider.qml | 6 |
2 files changed, 6 insertions, 10 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 diff --git a/src/imports/controls/universal/Slider.qml b/src/imports/controls/universal/Slider.qml index 5aa336ee..baf91211 100644 --- a/src/imports/controls/universal/Slider.qml +++ b/src/imports/controls/universal/Slider.qml @@ -42,11 +42,9 @@ T.Slider { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, - Math.max(background ? background.implicitWidth : 0, - handle ? handle.implicitWidth : 0) + leftPadding + rightPadding) + (handle ? handle.implicitWidth : 0) + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, - Math.max(background ? background.implicitHeight : 0, - handle ? handle.implicitHeight : 0) + topPadding + bottomPadding) + (handle ? handle.implicitHeight : 0) + topPadding + bottomPadding) padding: 6 |