diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2014-03-04 16:01:09 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-05 11:58:38 +0100 |
| commit | b48b2a35725209f4821349a1a8177f417307e914 (patch) | |
| tree | ad778bbc3ed3f3e3d8974b876bacfb201040d95f /src | |
| parent | 9e3b84506cab89de4c34e38d1e88aaeaafefc103 (diff) | |
| download | qtquickcontrols-b48b2a35725209f4821349a1a8177f417307e914.tar.gz | |
MenuStyle: Adding missing 'submenuPopupDelay' property
This amends e88bdffe644e53912dfbce95117555cb6a87bfd2
API-wise.
Change-Id: I9243aa05c3c4803e1c3ee08a761e782ee8e0841a
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/controls/Private/MenuContentItem.qml | 2 | ||||
| -rw-r--r-- | src/controls/Private/qquickstyleitem.cpp | 4 | ||||
| -rw-r--r-- | src/controls/Styles/Base/MenuStyle.qml | 3 | ||||
| -rw-r--r-- | src/controls/Styles/Desktop/MenuStyle.qml | 2 |
4 files changed, 9 insertions, 2 deletions
diff --git a/src/controls/Private/MenuContentItem.qml b/src/controls/Private/MenuContentItem.qml index d5d6f69d..59000391 100644 --- a/src/controls/Private/MenuContentItem.qml +++ b/src/controls/Private/MenuContentItem.qml @@ -212,7 +212,7 @@ Loader { Timer { id: openMenuTimer - interval: 50 + interval: d.style.submenuPopupDelay onTriggered: menuItemLoader.__showSubMenu(true) } diff --git a/src/controls/Private/qquickstyleitem.cpp b/src/controls/Private/qquickstyleitem.cpp index 5b7e6728..d794d1da 100644 --- a/src/controls/Private/qquickstyleitem.cpp +++ b/src/controls/Private/qquickstyleitem.cpp @@ -1145,9 +1145,11 @@ QVariant QQuickStyleItem::styleHint(const QString &metric) return qApp->style()->styleHint(QStyle::SH_ScrollBar_LeftClickAbsolutePosition); else if (metric == "activateItemOnSingleClick") return qApp->style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick); + else if (metric == "submenupopupdelay") + return qApp->style()->styleHint(QStyle::SH_Menu_SubMenuPopupDelay, m_styleoption); return 0; - // Add SH_Menu_SpaceActivatesItem, SH_Menu_SubMenuPopupDelay + // Add SH_Menu_SpaceActivatesItem } void QQuickStyleItem::setHints(const QVariantMap &str) diff --git a/src/controls/Styles/Base/MenuStyle.qml b/src/controls/Styles/Base/MenuStyle.qml index bec8410b..67aed5e5 100644 --- a/src/controls/Styles/Base/MenuStyle.qml +++ b/src/controls/Styles/Base/MenuStyle.qml @@ -93,6 +93,9 @@ Style { /*! The amount of pixels by which a submenu popup overlaps horizontally its parent menu. */ property int submenuOverlap: 1 + /*! The number of milliseconds to wait before opening a submenu. */ + property int submenuPopupDelay: 200 + /*! Returns a rich-text string to render mnemonics for a given menu item. The mnemonic character is prefixed by an ampersand in the original string. diff --git a/src/controls/Styles/Desktop/MenuStyle.qml b/src/controls/Styles/Desktop/MenuStyle.qml index 886fed3d..6cf67b1c 100644 --- a/src/controls/Styles/Desktop/MenuStyle.qml +++ b/src/controls/Styles/Desktop/MenuStyle.qml @@ -49,6 +49,7 @@ Style { property string __menuItemType: "menuitem" property int submenuOverlap: 0 + property int submenuPopupDelay: 0 property int __maxPopupHeight: 0 property Component frame: StyleItem { @@ -74,6 +75,7 @@ Style { styleRoot.padding.top = menuVMargin + menuPanelWidth styleRoot.padding.bottom = menuVMargin + menuPanelWidth styleRoot.submenuOverlap = 2 * menuPanelWidth + styleRoot.submenuPopupDelay = styleHint("submenupopupdelay") } // ### The Screen attached property can only be set on an Item, |