From 8e42f9aff5822b78944363d015764d2cb3736d2c Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Fri, 18 Dec 2015 20:26:55 +0100 Subject: Material ToolBar background Change-Id: I214c646de05b95d04a1b759820b93d02006c9206 Task-number: QTBUG-50025 Reviewed-by: Mitch Curtis --- src/imports/controls/material/ToolBar.qml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/imports') 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] } -- cgit v1.2.3