diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-03-15 16:34:20 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-04-05 13:59:44 +0000 |
| commit | 92e75ae5ec628f0902b096d16cd2cc3c29d89e4c (patch) | |
| tree | aa9a66d479bfee8973424d33191a073950bc03de /src/imports/controls/fusion | |
| parent | 3c4942f12fd33e91973cfa55aef8d675f4e32126 (diff) | |
QQuickScrollView: inherit QQuickPane
This allows us to remove duplicate properties, and ScrollView gets
Pane's automatic content size calculation, which allows us to remove
the respective QML bindings.
Change-Id: I96ba98c12d0bf294f19b2c2b3617bfc88326bb41
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/fusion')
| -rw-r--r-- | src/imports/controls/fusion/ScrollView.qml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/imports/controls/fusion/ScrollView.qml b/src/imports/controls/fusion/ScrollView.qml index 728888c3..494b5f96 100644 --- a/src/imports/controls/fusion/ScrollView.qml +++ b/src/imports/controls/fusion/ScrollView.qml @@ -47,9 +47,6 @@ T.ScrollView { implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) - contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : -1) - contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : -1) - ScrollBar.vertical: ScrollBar { parent: control x: control.mirrored ? 0 : control.width - width |