summaryrefslogtreecommitdiff
path: root/src/controls/Menu.qml
diff options
context:
space:
mode:
authorGabriel de Dietrich <gabriel.dedietrich@digia.com>2013-02-28 22:08:05 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-01 11:06:55 +0100
commita3737d7481aba3b93e23fb0c26e6a4dc13b75658 (patch)
treec2616c8b62108c33b3fb1e9591f6fdace1cd7335 /src/controls/Menu.qml
parentedc559b1e0bea1b4eed247e8bf9ada672d7e9dc9 (diff)
downloadqtquickcontrols-a3737d7481aba3b93e23fb0c26e6a4dc13b75658.tar.gz
MenuBar. Menu, MenuItem: Update documentation to new API
Also removed Menu.visibleParent since it had no apparent use. Likewise, trigger(), and the triggered() signal are now only in MenuItem. Change-Id: Ide194505664c60906019422a503b189250d6a86e Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'src/controls/Menu.qml')
-rw-r--r--src/controls/Menu.qml14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/controls/Menu.qml b/src/controls/Menu.qml
index 3f258fa9..7ba8a41e 100644
--- a/src/controls/Menu.qml
+++ b/src/controls/Menu.qml
@@ -84,6 +84,11 @@ import "Styles/Settings.js" as Settings
}
\endcode
+ Note that some properties, like \c enabled, \c text, or \c iconSource, only make sense
+ depending on the context in which the menu is being used. The three main use cases are
+ as a \l MenuBar top-level menu, as a submenu inside another menu, or as a standalone,
+ or context, menu.
+
\sa MenuBar, MenuItem, MenuSeparator
*/
MenuPrivate {
@@ -182,8 +187,9 @@ MenuPrivate {
function triggerAndDismiss() {
var item = itemsRepeater.itemAt(root.__currentIndex)
if (item && !item.isSeparator) {
- item.menuItem.trigger()
root.__dismissMenu()
+ if (!item.hasSubmenu)
+ item.menuItem.trigger()
}
}
@@ -269,11 +275,7 @@ MenuPrivate {
}
}
- Component.onCompleted: {
- menuItem.__visualItem = menuItemLoader
- if (hasSubmenu)
- menuItem.visualParent = menuItemLoader
- }
+ Component.onCompleted: menuItem.__visualItem = menuItemLoader
}
}