From 356f3c89b83704591e3c37cf8c322b52d6840763 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Fri, 28 Sep 2012 15:58:58 +0200 Subject: Fix syncing of visibility and enabled for menus on Cocoa Fixed menu handling on Cocoa so if a menu is enabled/disabled or made visible or not then it will keep this in sync with the appropriate native menu entry. Change-Id: If269185fcf065fb1b2f60d6ef8c27c107eb4509f Reviewed-by: Pasi Matilainen Reviewed-by: James Turner Reviewed-by: Andy Shaw --- src/plugins/platforms/cocoa/qcocoamenu.mm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/plugins/platforms/cocoa/qcocoamenu.mm') diff --git a/src/plugins/platforms/cocoa/qcocoamenu.mm b/src/plugins/platforms/cocoa/qcocoamenu.mm index 4d35b3202e..36d5c81f34 100644 --- a/src/plugins/platforms/cocoa/qcocoamenu.mm +++ b/src/plugins/platforms/cocoa/qcocoamenu.mm @@ -268,6 +268,12 @@ void QCocoaMenu::setParentItem(QCocoaMenuItem *item) void QCocoaMenu::setEnabled(bool enabled) { m_enabled = enabled; + syncModalState(!m_enabled); +} + +void QCocoaMenu::setVisible(bool visible) +{ + [m_nativeItem setSubmenu:(visible ? m_nativeMenu : nil)]; } QPlatformMenuItem *QCocoaMenu::menuItemAt(int position) const -- cgit v1.2.3