diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-09-23 15:50:55 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@digia.com> | 2014-09-30 17:45:11 +0200 |
| commit | 7909cd1e27996a475a2d111dba21210c4af947ad (patch) | |
| tree | fb5900c697ea321ae89b33f546302fa91a0bca15 /src/controls/ToolBar.qml | |
| parent | 83669a5a58d42e9ed09a3c5c39145b8a833fd87a (diff) | |
| download | qtquickcontrols-7909cd1e27996a475a2d111dba21210c4af947ad.tar.gz | |
ToolBar: add support for a stylable menu button
Change-Id: I75021d5a4b54104cccaf5988f0bc79efce3c4c9f
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src/controls/ToolBar.qml')
| -rw-r--r-- | src/controls/ToolBar.qml | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/src/controls/ToolBar.qml b/src/controls/ToolBar.qml index 8498860c..8fed257a 100644 --- a/src/controls/ToolBar.qml +++ b/src/controls/ToolBar.qml @@ -115,6 +115,9 @@ FocusScope { /*! \internal */ default property alias __content: container.data + /*! \internal */ + property var __menu + /*! \qmlproperty Item ToolBar::contentItem @@ -148,7 +151,7 @@ FocusScope { anchors.topMargin: topMargin anchors.leftMargin: leftMargin - anchors.rightMargin: rightMargin + anchors.rightMargin: rightMargin + buttonLoader.active ? buttonLoader.width : 0 anchors.bottomMargin: bottomMargin property int topMargin: __style ? __style.padding.top : 0 @@ -163,5 +166,17 @@ FocusScope { property real layoutHeight: layoutItem ? (layoutItem.implicitHeight || layoutItem.height) + (layoutItem.anchors.fill ? layoutItem.anchors.topMargin + layoutItem.anchors.bottomMargin : 0) : 0 - }] + }, + Loader { + id: buttonLoader + anchors.right: parent.right + anchors.rightMargin: container.rightMargin + anchors.verticalCenter: parent.verticalCenter + sourceComponent: ToolMenuButton { + menu: toolbar.__menu + panel: toolbar.__style.menuButton || null + } + active: !!__menu && __menu.items.length > 0 && !!__style.menuButton + } + ] } |