src/gui/dialogs/qfontdialog_mac.mm
changeset 3 41300fa6a67c
parent 0 1918ee327afb
child 4 3b1da2848fc7
child 7 f7bc934e204c
equal deleted inserted replaced
2:56cd8111b7f7 3:41300fa6a67c
   392         [mCancelButton release];
   392         [mCancelButton release];
   393         [ourContentView release];
   393         [ourContentView release];
   394     }
   394     }
   395     [mFontPanel setDelegate:nil];
   395     [mFontPanel setDelegate:nil];
   396     [[NSFontManager sharedFontManager] setDelegate:nil];
   396     [[NSFontManager sharedFontManager] setDelegate:nil];
       
   397 #ifdef QT_MAC_USE_COCOA
   397     [[NSFontManager sharedFontManager] setTarget:nil];
   398     [[NSFontManager sharedFontManager] setTarget:nil];
       
   399 #endif
   398 }
   400 }
   399 @end
   401 @end
   400 
   402 
   401 QT_BEGIN_NAMESPACE
   403 QT_BEGIN_NAMESPACE
   402 
   404 
   516                                                           priv:priv
   518                                                           priv:priv
   517                                                     extraWidth:dialogExtraWidth
   519                                                     extraWidth:dialogExtraWidth
   518                                                    extraHeight:dialogExtraHeight];
   520                                                    extraHeight:dialogExtraHeight];
   519     [ourPanel setDelegate:delegate];
   521     [ourPanel setDelegate:delegate];
   520     [[NSFontManager sharedFontManager] setDelegate:delegate];
   522     [[NSFontManager sharedFontManager] setDelegate:delegate];
       
   523 #ifdef QT_MAC_USE_COCOA
   521     [[NSFontManager sharedFontManager] setTarget:delegate];
   524     [[NSFontManager sharedFontManager] setTarget:delegate];
       
   525 #endif
   522     setFont(delegate, initial);
   526     setFont(delegate, initial);
   523 
   527 
   524     // hack to get correct initial layout
   528     // hack to get correct initial layout
   525     NSRect frameRect = [ourPanel frame];
   529     NSRect frameRect = [ourPanel frame];
   526     frameRect.size.width += 1.0;
   530     frameRect.size.width += 1.0;
   623             weight = 9;
   627             weight = 9;
   624             mask |= NSBoldFontMask;
   628             mask |= NSBoldFontMask;
   625         }
   629         }
   626 
   630 
   627         NSFontManager *mgr = [NSFontManager sharedFontManager];
   631         NSFontManager *mgr = [NSFontManager sharedFontManager];
   628         nsFont = [mgr fontWithFamily:qt_mac_QStringToNSString(font.family())
   632         QFontInfo fontInfo(font);
       
   633         nsFont = [mgr fontWithFamily:qt_mac_QStringToNSString(fontInfo.family())
   629             traits:mask
   634             traits:mask
   630             weight:weight
   635             weight:weight
   631             size:QFontInfo(font).pointSize()];
   636             size:fontInfo.pointSize()];
   632     }
   637     }
   633 
   638 
   634     [mgr setSelectedFont:nsFont isMultiple:NO];
   639     [mgr setSelectedFont:nsFont isMultiple:NO];
   635     [static_cast<QCocoaFontPanelDelegate *>(delegate) setQtFont:font];
   640     [static_cast<QCocoaFontPanelDelegate *>(delegate) setQtFont:font];
   636 }
   641 }