diff options
| author | Norwegian Rock Cat <qt-info@nokia.com> | 2009-07-16 14:59:15 (GMT) |
|---|---|---|
| committer | Norwegian Rock Cat <qt-info@nokia.com> | 2009-07-24 09:43:23 (GMT) |
| commit | 777b93a0a48096e68124feec4c0e0cab3d60c36a (patch) | |
| tree | 80ff05a695db37632d2c1cb213ce340d33cac2e8 /src/gui/widgets/qcocoamenu_mac.mm | |
| parent | f04b5ea9e0f06904f15d93245ef597483ba9e790 (diff) | |
| download | Qt-777b93a0a48096e68124feec4c0e0cab3d60c36a.zip Qt-777b93a0a48096e68124feec4c0e0cab3d60c36a.tar.gz Qt-777b93a0a48096e68124feec4c0e0cab3d60c36a.tar.bz2 | |
Get collapsible menus working correctly.
There was an attempt to do this earlier, but it was a bit more complex
than it needed to be. We now do the update on show in Cocoa. Carbon
actually does it all for us, we just need to flip the bit. We may do the
updates to often, but it's better than not enough.
Task-Id: 195445
Reviewed-by: Denis
Diffstat (limited to 'src/gui/widgets/qcocoamenu_mac.mm')
| -rw-r--r-- | src/gui/widgets/qcocoamenu_mac.mm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/widgets/qcocoamenu_mac.mm b/src/gui/widgets/qcocoamenu_mac.mm index 3338fd8..f3bb73e 100644 --- a/src/gui/widgets/qcocoamenu_mac.mm +++ b/src/gui/widgets/qcocoamenu_mac.mm @@ -98,7 +98,9 @@ QT_USE_NAMESPACE while (QWidget *popup = QApplication::activePopupWidget()) popup->close(); - qt_mac_emit_menuSignals(((QT_MANGLE_NAMESPACE(QCocoaMenu) *)menu)->qmenu, true); + QMenu *qtmenu = static_cast<QT_MANGLE_NAMESPACE(QCocoaMenu) *>(menu)->qmenu; + qt_mac_emit_menuSignals(qtmenu, true); + qt_mac_menu_collapseSeparators(menu, qtmenu->separatorsCollapsible()); } - (void)menuWillClose:(NSMenu*)menu; |