diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-06-14 21:22:43 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-06-15 08:05:54 +0000 |
| commit | b793cbe460e311b3ed118b02635165db853696c4 (patch) | |
| tree | e00699aefeadf62e9cbc65004a84174ba8f92dc9 /src/imports/controls/ToolBar.qml | |
| parent | d2b13164d85fffc7d379304ca5aefc9304e53a8a (diff) | |
GroupBox/Frame/ToolBar: use positioners as content item
Change-Id: I8f883dd0fd06172032dd78ff60437c906c2fe8dd
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/ToolBar.qml')
| -rw-r--r-- | src/imports/controls/ToolBar.qml | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/imports/controls/ToolBar.qml b/src/imports/controls/ToolBar.qml index 43666db2..7677607d 100644 --- a/src/imports/controls/ToolBar.qml +++ b/src/imports/controls/ToolBar.qml @@ -43,17 +43,15 @@ AbstractToolBar { default property alias data: content.data implicitWidth: Math.max(background ? background.implicitWidth : 0, - contentWidth + leftPadding + rightPadding) + contentItem.implicitWidth + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, - contentHeight + topPadding + bottomPadding) - - contentWidth: content.children.length === 1 ? content.children[0].implicitWidth : 0 - contentHeight: content.children.length === 1 ? content.children[0].implicitHeight : 0 + contentItem.implicitHeight + topPadding + bottomPadding) Accessible.role: Accessible.ToolBar - contentItem: Item { + contentItem: Row { id: content + spacing: control.Theme.spacing } background: Rectangle { |