Changeset 561 for trunk/src/gui/dialogs/qfontdialog_mac.mm

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/dialogs/qfontdialog_mac.mm (modified) (16 diffs)

trunk/src/gui/dialogs/qfontdialog_mac.mm

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -48 +48 @@
 #include <private/qfont_p.h>
 #include <private/qfontengine_p.h>
+#include <private/qt_cocoa_helpers_mac_p.h>
 #include <private/qt_mac_p.h>
 #include <qdebug.h>
@@ -78 +79 @@
 #if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5
 
-@protocol NSWindowDelegate <NSObject> @end
+@protocol NSWindowDelegate <NSObject>
+- (NSSize)windowWillResize:(NSWindow *)window toSize:(NSSize)proposedFrameSize;
+@end
 
 #endif
@@ -88 +91 @@
     NSButton *mCancelButton;
     QFontDialogPrivate *mPriv;
-    NSFont *mCocoaFont;
     QFont *mQtFont;
     BOOL mPanelHackedWithButtons;
@@ -120 +122 @@
 @end
 
+static QFont qfontForCocoaFont(NSFont *cocoaFont, const QFont &resolveFont)
+{
+    QFont newFont;
+    if (cocoaFont) {
+        int pSize = qRound([cocoaFont pointSize]);
+        QString family(qt_mac_NSStringToQString([cocoaFont familyName]));
+        QString typeface(qt_mac_NSStringToQString([cocoaFont fontName]));
+
+        int hyphenPos = typeface.indexOf(QLatin1Char('-'));
+        if (hyphenPos != -1) {
+            typeface.remove(0, hyphenPos + 1);
+        } else {
+            typeface = QLatin1String("Normal");
+        }
+
+        newFont = QFontDatabase().font(family, typeface, pSize);
+        newFont.setUnderline(resolveFont.underline());
+        newFont.setStrikeOut(resolveFont.strikeOut());
+
+    }
+    return newFont;
+}
+
 @implementation QCocoaFontPanelDelegate
 - (id)initWithFontPanel:(NSFontPanel *)panel
@@ -135 +160 @@
     mCancelButton = cancelButton;
     mPriv = priv;
-    mCocoaFont = 0;
     mPanelHackedWithButtons = (okButton != 0);
     mDialogExtraWidth = extraWidth;
@@ -156 +180 @@
 - (void)dealloc
 {
-    if (mCocoaFont)
-        [mCocoaFont release];
     delete mQtFont;
     [super dealloc];
@@ -164 +186 @@
 - (void)changeFont:(id)sender
 {
-    Q_UNUSED(sender);
-
-    QFont newFont;
-
-    if (mCocoaFont)
-        [mCocoaFont autorelease];
     NSFont *dummyFont = [NSFont userFontOfSize:12.0];
-    mCocoaFont = [sender convertFont:dummyFont];
-    if (mCocoaFont) {
-        [mCocoaFont retain];
-
-        int pSize = qRound([mCocoaFont pointSize]);
-        QString family(QCFString::toQString(reinterpret_cast<CFStringRef>([mCocoaFont familyName])));
-        QString typeface(QCFString::toQString(reinterpret_cast<CFStringRef>([mCocoaFont fontName])));
-//        qDebug() << "original family" << family << "typeface" << typeface << "psize" << pSize;
-        int hyphenPos = typeface.indexOf(QLatin1Char('-'));
-        if (hyphenPos != -1) {
-            typeface.remove(0, hyphenPos + 1);
-        } else {
-            typeface = QLatin1String("Normal");
-        }
-//        qDebug() << " massaged family" << family << "typeface" << typeface << "psize" << pSize;
-        newFont = QFontDatabase().font(family, typeface, pSize);
-        newFont.setUnderline(mQtFont->underline());
-        newFont.setStrikeOut(mQtFont->strikeOut());
-    }
-
-    [self setQtFont:newFont];
+    [self setQtFont:qfontForCocoaFont([sender convertFont:dummyFont], *mQtFont)];
     if (mPriv)
         mPriv->updateSampleFont(*mQtFont);
@@ -318 +314 @@
 {
     Q_ASSERT(mPanelHackedWithButtons);
+    NSFontManager *fontManager = [NSFontManager sharedFontManager];
+    [self setQtFont:qfontForCocoaFont([fontManager convertFont:[fontManager selectedFont]],
+                                      *mQtFont)];
     [[mStolenContentView window] close];
     [self finishOffWithCode:NSOKButton];
@@ -375 +374 @@
         }
 
-        // temporary hack to work around bug in deleteLater() in Qt/Mac Cocoa
-#if 1
-        bool deleteDialog = mPriv->fontDialog()->testAttribute(Qt::WA_DeleteOnClose);
-        mPriv->fontDialog()->setAttribute(Qt::WA_DeleteOnClose, false);
-#endif
         mPriv->done((code == NSOKButton) ? QDialog::Accepted : QDialog::Rejected);
-#if 1
-        if (deleteDialog)
-            delete mPriv->fontDialog();
-#endif
     } else {
         [NSApp stopModalWithCode:code];
@@ -405 +395 @@
     [mFontPanel setDelegate:nil];
     [[NSFontManager sharedFontManager] setDelegate:nil];
+#ifdef QT_MAC_USE_COCOA
     [[NSFontManager sharedFontManager] setTarget:nil];
+#endif
 }
 @end
@@ -529 +521 @@
     [ourPanel setDelegate:delegate];
     [[NSFontManager sharedFontManager] setDelegate:delegate];
+#ifdef QT_MAC_USE_COCOA
     [[NSFontManager sharedFontManager] setTarget:delegate];
+#endif
     setFont(delegate, initial);
 
@@ -580 +574 @@
 void QFontDialogPrivate::closeCocoaFontPanel(void *delegate)
 {
+    QMacCocoaAutoReleasePool pool;
     QCocoaFontPanelDelegate *theDelegate = static_cast<QCocoaFontPanelDelegate *>(delegate);
     NSWindow *ourPanel = [theDelegate actualPanel];
@@ -611 +606 @@
 }
 
-void QFontDialogPrivate::setFont(void * delegate, const QFont &font)
-{
+void QFontDialogPrivate::setFont(void *delegate, const QFont &font)
+{
+    QMacCocoaAutoReleasePool pool;
     QFontEngine *fe = font.d->engineForScript(QUnicodeTables::Common);
+    NSFontManager *mgr = [NSFontManager sharedFontManager];
+    NSFont *nsFont = 0;
+
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
     if (qstrcmp(fe->name(), "CoreText") == 0) {
-        const NSFont *nsFont = reinterpret_cast<const NSFont *>(static_cast<QCoreTextFontEngineMulti *>(fe)->ctfont);
-        [[NSFontManager sharedFontManager] setSelectedFont:nsFont isMultiple:NO];
-    }
-#endif
+        nsFont = reinterpret_cast<const NSFont *>(static_cast<QCoreTextFontEngineMulti *>(fe)->ctfont);
+    } else
+#endif
+    {
+        int weight = 5;
+        NSFontTraitMask mask = 0;
+        if (font.style() == QFont::StyleItalic) {
+            mask |= NSItalicFontMask;
+        }
+        if (font.weight() == QFont::Bold) {
+            weight = 9;
+            mask |= NSBoldFontMask;
+        }
+
+        NSFontManager *mgr = [NSFontManager sharedFontManager];
+        QFontInfo fontInfo(font);
+        nsFont = [mgr fontWithFamily:qt_mac_QStringToNSString(fontInfo.family())
+            traits:mask
+            weight:weight
+            size:fontInfo.pointSize()];
+    }
+
+    [mgr setSelectedFont:nsFont isMultiple:NO];
     [static_cast<QCocoaFontPanelDelegate *>(delegate) setQtFont:font];
 }