From c803830c02fb573582cd848185460ba65b4529e5 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Thu, 18 Jun 2015 14:35:54 +0200 Subject: Frame, GroupBox, ToolBar: restore contentWidth & contentHeight Change-Id: I79a974c64f6ec57ebfa83cea0857b2a1590af61f Reviewed-by: J-P Nurmi --- src/imports/controls/Frame.qml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/imports/controls/Frame.qml') diff --git a/src/imports/controls/Frame.qml b/src/imports/controls/Frame.qml index 849b8e62..9fad13dc 100644 --- a/src/imports/controls/Frame.qml +++ b/src/imports/controls/Frame.qml @@ -42,16 +42,16 @@ AbstractFrame { default property alias data: content.data - implicitWidth: Math.max(background ? background.implicitWidth : 0, - contentItem.implicitWidth + leftPadding + rightPadding) - implicitHeight: Math.max(background ? background.implicitHeight : 0, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) + + contentWidth: contentItem.children.length === 1 ? contentItem.children[0].implicitWidth : 0 + contentHeight: contentItem.children.length === 1 ? contentItem.children[0].implicitHeight : 0 padding: Theme.padding - contentItem: Column { + contentItem: Item { id: content - spacing: control.Theme.spacing } frame: Rectangle { -- cgit v1.2.3