diff options
author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-25 13:05:48 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-25 12:13:31 +0000 |
commit | 06d4931ede0a1b4422a52014b3bed7a4036d6bcc (patch) | |
tree | 05ea5d744898928460f6781754de8f0b5c07ce63 /tests/auto/controls/data/tst_toolbar.qml | |
parent | d665c0faf4ac52a8aeed48ee8497b5d61becedc5 (diff) |
Containers: use the implicit size of the contentItem
The result of:
Frame {
ColumnLayout {
RadioButton { text: "First" }
RadioButton { text: "Second" }
RadioButton { text: "Third" }
}
}
is now identical to:
Frame {
contentItem: ColumnLayout {
RadioButton { text: "First" }
RadioButton { text: "Second" }
RadioButton { text: "Third" }
}
}
Change-Id: I823b2259dabb66db0dddef41ea396f7ac1000a82
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'tests/auto/controls/data/tst_toolbar.qml')
-rw-r--r-- | tests/auto/controls/data/tst_toolbar.qml | 34 |
1 files changed, 28 insertions, 6 deletions
diff --git a/tests/auto/controls/data/tst_toolbar.qml b/tests/auto/controls/data/tst_toolbar.qml index ac116a86..128aa403 100644 --- a/tests/auto/controls/data/tst_toolbar.qml +++ b/tests/auto/controls/data/tst_toolbar.qml @@ -57,7 +57,7 @@ TestCase { Component { id: oneChildBar - GroupBox { + ToolBar { Item { implicitWidth: 100 implicitHeight: 30 @@ -67,7 +67,7 @@ TestCase { Component { id: twoChildrenBar - GroupBox { + ToolBar { Item { implicitWidth: 100 implicitHeight: 30 @@ -79,6 +79,16 @@ TestCase { } } + Component { + id: contentBar + ToolBar { + contentItem: Item { + implicitWidth: 100 + implicitHeight: 30 + } + } + } + function test_empty() { var control = toolBar.createObject(testCase) verify(control) @@ -96,8 +106,8 @@ TestCase { compare(control.contentWidth, 100) compare(control.contentHeight, 30) - verify(control.implicitWidth > 100) - verify(control.implicitHeight > 30) + verify(control.implicitWidth >= 100) + verify(control.implicitHeight >= 30) control.destroy() } @@ -108,8 +118,20 @@ TestCase { compare(control.contentWidth, 0) compare(control.contentHeight, 0) - verify(control.implicitWidth > 0) - verify(control.implicitHeight > 0) + verify(control.implicitWidth >= 0) + verify(control.implicitHeight >= 0) + + control.destroy() + } + + function test_contentItem() { + var control = contentBar.createObject(testCase) + verify(control) + + compare(control.contentWidth, 100) + compare(control.contentHeight, 30) + verify(control.implicitWidth >= 100) + verify(control.implicitHeight >= 30) control.destroy() } |