diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-18 20:26:55 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-25 22:59:30 +0000 |
| commit | 8e42f9aff5822b78944363d015764d2cb3736d2c (patch) | |
| tree | 0c9c2d73bb521e2c37c094c47fc379fcbc71dde0 | |
| parent | 8cd268e994576a853bf430a6f60b94aa2767c20e (diff) | |
Material ToolBar background
Change-Id: I214c646de05b95d04a1b759820b93d02006c9206
Task-number: QTBUG-50025
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| -rw-r--r-- | src/imports/controls/material/ToolBar.qml | 12 | ||||
| -rw-r--r-- | tests/manual/testbench/main.qml | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/imports/controls/material/ToolBar.qml b/src/imports/controls/material/ToolBar.qml index 2565f0b1..50a4ac67 100644 --- a/src/imports/controls/material/ToolBar.qml +++ b/src/imports/controls/material/ToolBar.qml @@ -36,12 +36,13 @@ import QtQuick 2.6 import Qt.labs.templates 1.0 as T +import Qt.labs.controls.material 1.0 T.ToolBar { id: control - implicitWidth: contentWidth + leftPadding + rightPadding - implicitHeight: Math.max(40, contentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) contentWidth: contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0 contentHeight: contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0 @@ -49,4 +50,11 @@ T.ToolBar { //! [contentItem] contentItem: Item { } //! [contentItem] + + //! [background] + background: Rectangle { + implicitHeight: 40 + color: control.Material.accentColor + } + //! [background] } diff --git a/tests/manual/testbench/main.qml b/tests/manual/testbench/main.qml index 84c113ec..edf0aa49 100644 --- a/tests/manual/testbench/main.qml +++ b/tests/manual/testbench/main.qml @@ -62,6 +62,8 @@ ApplicationWindow { } header: ToolBar { + Material.theme: Material.Dark + RowLayout { anchors.fill: parent |