diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-06-25 23:18:34 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-06-25 21:27:16 +0000 |
| commit | ec7a1bece72c9c740f1405721a468d3272d77b4e (patch) | |
| tree | db5b3ab59e9513ac701d14301d7fa51d4a97fc05 | |
| parent | e53cc743fc493644e77a69f665975d6f76ef23b1 (diff) | |
Simplify Frame/GroupBox/ToolBar::contentWidth/Height bindings
Change-Id: I78f081488915dc5d80362de7ef8389433d487687
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| -rw-r--r-- | src/imports/controls/Frame.qml | 4 | ||||
| -rw-r--r-- | src/imports/controls/GroupBox.qml | 4 | ||||
| -rw-r--r-- | src/imports/controls/ToolBar.qml | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/imports/controls/Frame.qml b/src/imports/controls/Frame.qml index f721f974..9e016b40 100644 --- a/src/imports/controls/Frame.qml +++ b/src/imports/controls/Frame.qml @@ -43,8 +43,8 @@ AbstractFrame { 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 + contentWidth: contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0 + contentHeight: contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0 padding: Theme.padding diff --git a/src/imports/controls/GroupBox.qml b/src/imports/controls/GroupBox.qml index d9a8ea6a..cc84008f 100644 --- a/src/imports/controls/GroupBox.qml +++ b/src/imports/controls/GroupBox.qml @@ -43,8 +43,8 @@ AbstractGroupBox { 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 + contentWidth: contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0 + contentHeight: contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0 padding: Theme.padding topPadding: Theme.padding + (label && title ? label.implicitHeight + Theme.spacing : 0) diff --git a/src/imports/controls/ToolBar.qml b/src/imports/controls/ToolBar.qml index 0d5a5a16..b7ed3c98 100644 --- a/src/imports/controls/ToolBar.qml +++ b/src/imports/controls/ToolBar.qml @@ -43,8 +43,8 @@ AbstractToolBar { 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 + contentWidth: contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0 + contentHeight: contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0 Accessible.role: Accessible.ToolBar |