diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2013-06-27 15:07:07 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-27 20:50:38 +0200 |
| commit | c4dfd13f7881b9029aaa1d5b8561492bd9026e98 (patch) | |
| tree | 3420dff6dc0ed8b66c41a6c04f8c335e8e59be0e /src/plugins/platforms/cocoa | |
| parent | 241eca33ed45f112feed18c6256c31e606f47796 (diff) | |
Cocoa: Don't update the menubar when popups are shown
Task-number: QTBUG-31532
Change-Id: I86084cb96bd1dd253b3e2e4413c06de053b95b3b
Reviewed-by: Romain Perier <romain.perier@gmail.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoamenubar.mm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoamenubar.mm b/src/plugins/platforms/cocoa/qcocoamenubar.mm index 73331db40d..8d1ca88b8e 100644 --- a/src/plugins/platforms/cocoa/qcocoamenubar.mm +++ b/src/plugins/platforms/cocoa/qcocoamenubar.mm @@ -203,6 +203,11 @@ void QCocoaMenuBar::updateMenuBarImmediately() QCocoaAutoReleasePool pool; QCocoaMenuBar *mb = findGlobalMenubar(); QCocoaWindow *cw = findWindowForMenubar(); + + QWindow *win = cw ? cw->window() : 0; + if (win && (win->flags() & Qt::Popup) == Qt::Popup) + return; // context menus, comboboxes, etc. don't need to update the menubar + if (cw && cw->menubar()) mb = cw->menubar(); |