diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-06-01 23:36:57 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-06-13 09:34:39 +0000 |
| commit | 92fcd0a3fb2ee0d1ba242607c1aa5a29864d3650 (patch) | |
| tree | e55ace5afc75cfaa17f2571fda8cfae2d8f4e9f8 /src/imports/controls/universal | |
| parent | 23a80af1b5d31621bf1d342706c9541dd5273b86 (diff) | |
Add support for cascading sub-menus
This commit adds initial support for cascading sub-menus by allowing
one to nest declarative Menu declarations. A follow-up commit adds
support for adding, inserting, and removing menus programmatically.
[ChangeLog][Controls][Menu] Added support for cascading sub-menus.
Task-number: QTBUG-60351
Change-Id: I0eee4f74d92a97c09333fcc4348b019782448535
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/universal')
| -rw-r--r-- | src/imports/controls/universal/Menu.qml | 1 | ||||
| -rw-r--r-- | src/imports/controls/universal/MenuItem.qml | 16 |
2 files changed, 15 insertions, 2 deletions
diff --git a/src/imports/controls/universal/Menu.qml b/src/imports/controls/universal/Menu.qml index d7a27563..b2e71106 100644 --- a/src/imports/controls/universal/Menu.qml +++ b/src/imports/controls/universal/Menu.qml @@ -48,6 +48,7 @@ T.Menu { contentItem ? contentItem.implicitHeight : 0) + topPadding + bottomPadding margins: 0 + overlap: 1 delegate: MenuItem { } diff --git a/src/imports/controls/universal/MenuItem.qml b/src/imports/controls/universal/MenuItem.qml index 7924e025..56f2eafa 100644 --- a/src/imports/controls/universal/MenuItem.qml +++ b/src/imports/controls/universal/MenuItem.qml @@ -60,8 +60,10 @@ T.MenuItem { icon.color: !enabled ? Universal.baseLowColor : Universal.baseHighColor contentItem: IconLabel { - leftPadding: control.checkable && !control.mirrored ? control.indicator.width + control.spacing : 0 - rightPadding: control.checkable && control.mirrored ? control.indicator.width + control.spacing : 0 + readonly property real arrowPadding: control.subMenu && control.arrow ? control.arrow.width + control.spacing : 0 + readonly property real indicatorPadding: control.checkable && control.indicator ? control.indicator.width + control.spacing : 0 + leftPadding: !control.mirrored ? indicatorPadding : arrowPadding + rightPadding: control.mirrored ? indicatorPadding : arrowPadding spacing: control.spacing mirrored: control.mirrored @@ -74,6 +76,16 @@ T.MenuItem { color: !control.enabled ? control.Universal.baseLowColor : control.Universal.baseHighColor } + arrow: ColorImage { + x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding + y: control.topPadding + (control.availableHeight - height) / 2 + + visible: control.subMenu + mirror: control.mirrored + color: !enabled ? control.Universal.baseLowColor : control.Universal.baseHighColor + source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Universal/images/rightarrow.png" + } + indicator: ColorImage { x: control.text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 |