diff options
| author | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2010-03-03 14:30:46 (GMT) |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2010-03-05 14:17:50 (GMT) |
| commit | 0e9bd62d905db6e0015a58609a747bb22521f8cc (patch) | |
| tree | 11e9c19dce5cecc38bf8f7b12323622e0302ac52 /src/gui/kernel/qwidget_mac.mm | |
| parent | 0dfb7598e4659dc912c2b3ace7dfdb93f953f83c (diff) | |
| download | Qt-0e9bd62d905db6e0015a58609a747bb22521f8cc.zip Qt-0e9bd62d905db6e0015a58609a747bb22521f8cc.tar.gz Qt-0e9bd62d905db6e0015a58609a747bb22521f8cc.tar.bz2 | |
Mac: non-modal native qfontdialog does not work at all
This was never implemented, and as it stands, just creating a
QFontDialog and calling show on it will not show anything. This
patch makes sure that show works, and that one can have more than
one font dialog showing at the same time (but only the first one will
be native)
Reviewed-by: cduclos
Diffstat (limited to 'src/gui/kernel/qwidget_mac.mm')
| -rw-r--r-- | src/gui/kernel/qwidget_mac.mm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index 6d8c97b..3622bac 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -3433,8 +3433,10 @@ void QWidgetPrivate::show_sys() // The window is modally shaddowed, so we need to make // sure that we don't pop in front of the modal window: [window orderFront:window]; - if (NSWindow *modalWin = qt_mac_window_for(top)) - [modalWin orderFront:window]; + if (!top->testAttribute(Qt::WA_DontShowOnScreen)) { + if (NSWindow *modalWin = qt_mac_window_for(top)) + [modalWin orderFront:window]; + } } #endif if (q->windowType() == Qt::Popup) { |