diff options
| author | Richard Moe Gustavsen <richard.gustavsen@digia.com> | 2014-09-23 15:08:14 +0200 |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@digia.com> | 2014-09-25 15:35:52 +0200 |
| commit | 4dffab4c39f686f4dc3136adcd838f3591ca0bfc (patch) | |
| tree | 331edfdc7807db6bc3b1bb59bf6954431e200bfd /src/plugins/platforms/ios/qiosmenu.h | |
| parent | 28b5038d1bb426b43df9a18b7ce7343c154bc6f4 (diff) | |
iOS: add support for submenus
Change-Id: I3816f2518125ad9c013ab578853295bf2c6bd02e
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Diffstat (limited to 'src/plugins/platforms/ios/qiosmenu.h')
| -rw-r--r-- | src/plugins/platforms/ios/qiosmenu.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/plugins/platforms/ios/qiosmenu.h b/src/plugins/platforms/ios/qiosmenu.h index 5a153c9a06..37578cdb24 100644 --- a/src/plugins/platforms/ios/qiosmenu.h +++ b/src/plugins/platforms/ios/qiosmenu.h @@ -49,6 +49,7 @@ #import "quiview.h" +class QIOSMenu; @class QUIMenuController; @class QUIPickerView; @@ -62,7 +63,7 @@ public: void setText(const QString &text) Q_DECL_OVERRIDE; void setIcon(const QIcon &) Q_DECL_OVERRIDE {} - void setMenu(QPlatformMenu *) Q_DECL_OVERRIDE {} + void setMenu(QPlatformMenu *) Q_DECL_OVERRIDE; void setVisible(bool isVisible) Q_DECL_OVERRIDE; void setIsSeparator(bool) Q_DECL_OVERRIDE; void setFont(const QFont &) Q_DECL_OVERRIDE {} @@ -79,6 +80,7 @@ public: MenuRole m_role; bool m_enabled; bool m_separator; + QIOSMenu *m_menu; private: QString removeMnemonics(const QString &original); @@ -112,6 +114,8 @@ public: QPlatformMenuItem *menuItemAt(int position) const Q_DECL_OVERRIDE; QPlatformMenuItem *menuItemForTag(quintptr tag) const Q_DECL_OVERRIDE; + void handleItemSelected(QIOSMenuItem *menuItem); + static QIOSMenu *currentMenu() { return m_currentMenu; } static id menuActionTarget() { return m_currentMenu ? m_currentMenu->m_menuController : 0; } @@ -126,6 +130,7 @@ private: QString m_text; MenuType m_menuType; MenuType m_effectiveMenuType; + QPointer<QWindow> m_parentWindow; QRect m_targetRect; const QIOSMenuItem *m_targetItem; QUIMenuController *m_menuController; |