diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-03-09 11:44:27 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-03-09 13:32:21 +0000 |
| commit | 87dec648804bfa974a297c37542dd77de9f72e9f (patch) | |
| tree | 1a242c80ce83e8a3185a5a7ca0a9d78a76175860 /src/imports/controls/universal/Frame.qml | |
| parent | b6d847ac5bb0e32f928f616cee03d323aab33e55 (diff) | |
QQuickPane: calculate content size in C++ unless explicitly defined
No more need for the clumsy and slow contentWidth and contentHeight
bindings in Pane and its derivatives.
QmlBench on TX1:
Pane: 26.4 -> 32.8 frames (~24%)
Frame: 25.4 -> 31 frames (~22%)
GroupBox: 28.6 -> 32 frames (~12%)
Change-Id: I4ba1d46ba6328de2ee0955c241d4b090127f6b85
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/universal/Frame.qml')
| -rw-r--r-- | src/imports/controls/universal/Frame.qml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/imports/controls/universal/Frame.qml b/src/imports/controls/universal/Frame.qml index 437325cd..fa4efc19 100644 --- a/src/imports/controls/universal/Frame.qml +++ b/src/imports/controls/universal/Frame.qml @@ -44,9 +44,6 @@ T.Frame { 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 : 0) - contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) - padding: 12 background: Rectangle { |