From ae7a573fe9d74f8d8355ca95f66ba160fa176270 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 16 Dec 2024 11:54:40 +0100 Subject: Compute implicitSize based on implicitContentSize in Pane and subclasses Now that Pane reflects its explicitly set contentWidth/Height through implicitContentWidth/Height we can use the same expression for implicit width/height as regular controls, which hooks us into the safe area binding loop detection as well. Pick-to: 6.9 Change-Id: Ie31b740a1e405341fc5f0ed9673b213292e4afd9 Reviewed-by: Oliver Eftevaag --- src/quickcontrols/fusion/ScrollView.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/quickcontrols/fusion/ScrollView.qml') diff --git a/src/quickcontrols/fusion/ScrollView.qml b/src/quickcontrols/fusion/ScrollView.qml index 60789313c9..a465f97f63 100644 --- a/src/quickcontrols/fusion/ScrollView.qml +++ b/src/quickcontrols/fusion/ScrollView.qml @@ -9,9 +9,9 @@ T.ScrollView { id: control implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) ScrollBar.vertical: ScrollBar { parent: control -- cgit v1.2.3