diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2013-03-22 17:43:23 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-22 21:09:44 +0100 |
| commit | ee0303b00b238f65e47d692e61a0b68195e89c02 (patch) | |
| tree | 0e2fa6a9ac482d687ee807a10d176b1210f12ea7 /src/controls/ToolBar.qml | |
| parent | 0853b1607169708ec9d75ca023380dcc422259ca (diff) | |
| download | qtquickcontrols-ee0303b00b238f65e47d692e61a0b68195e89c02.tar.gz | |
ToolBar: Fix height on Mac
Would not contain the toolbuton's pressed shadow.
Change-Id: I989e6ec38d0632fcd4c09e1805ec3fa0133d9b93
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'src/controls/ToolBar.qml')
| -rw-r--r-- | src/controls/ToolBar.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controls/ToolBar.qml b/src/controls/ToolBar.qml index 0c555cb5..5463eb3c 100644 --- a/src/controls/ToolBar.qml +++ b/src/controls/ToolBar.qml @@ -69,7 +69,7 @@ import QtQuick.Controls.Private 1.0 */ Item { - implicitHeight: toolbar.implicitHeight + implicitHeight: Math.max(childrenRect.height, toolbar.implicitHeight) implicitWidth: parent ? parent.width : toolbar.implicitWidth activeFocusOnTab: false Accessible.role: Accessible.ToolBar |