diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2010-08-04 09:07:55 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2010-08-04 09:07:55 (GMT) |
| commit | 7311f68fd1849db3b2dec7e56ae08464f482a1b2 (patch) | |
| tree | 7c564a53585a37a238531ee06297335a5aeaa755 /src | |
| parent | 11f8bbaff73811c8d3342600bc7c77f47c34c7de (diff) | |
| parent | ad8f35ca1516103d6226d378cf080fb5f5f5f515 (diff) | |
| download | Qt-7311f68fd1849db3b2dec7e56ae08464f482a1b2.zip Qt-7311f68fd1849db3b2dec7e56ae08464f482a1b2.tar.gz Qt-7311f68fd1849db3b2dec7e56ae08464f482a1b2.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/dialogs/qfontdialog_mac.mm | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/gui/dialogs/qfontdialog_mac.mm b/src/gui/dialogs/qfontdialog_mac.mm index bb8ef3f..9c63dfa 100644 --- a/src/gui/dialogs/qfontdialog_mac.mm +++ b/src/gui/dialogs/qfontdialog_mac.mm @@ -131,6 +131,7 @@ const int StyleMask = NSTitledWindowMask | NSClosableWindowMask | NSResizableWin - (QFont)qtFont; - (void)finishOffWithCode:(NSInteger)result; - (void)cleanUpAfterMyself; +- (void)setSubwindowStacking; @end static QFont qfontForCocoaFont(NSFont *cocoaFont, const QFont &resolveFont) @@ -187,6 +188,12 @@ static QFont qfontForCocoaFont(NSFont *cocoaFont, const QFont &resolveFont) [cancelButton setTarget:self]; } + mQtFont = new QFont(); + return self; +} + +- (void)setSubwindowStacking +{ #ifdef QT_MAC_USE_COCOA // Stack the native dialog in front of its parent, if any: QFontDialog *q = mPriv->fontDialog(); @@ -199,9 +206,6 @@ static QFont qfontForCocoaFont(NSFont *cocoaFont, const QFont &resolveFont) } } #endif - - mQtFont = new QFont(); - return self; } - (void)dealloc @@ -610,6 +614,7 @@ void QFontDialogPrivate::createNSFontPanelDelegate() [ourPanel setFrame:frameRect display:NO]; [ourPanel center]; } + [del setSubwindowStacking]; NSString *title = @"Select font"; [ourPanel setTitle:title]; } |