Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use modernized names for cocoa fonts

Browse Source 
Old names have been deprecated
This commit is contained in:
Kovid Goyal 2018-12-24 11:05:51 +05:30
parent 5b3b05a943
commit d10d7371ce
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/calibre/headless/coretext_fontdatabase.mm
View File

@ -716,71 +716,71 @@ static CTFontUIFontType fontTypeFromTheme(QPlatformTheme::Font f)
{
switch (f) {
case QPlatformTheme::SystemFont:
return kCTFontSystemFontType;
return kCTFontUIFontSystem;
case QPlatformTheme::MenuFont:
case QPlatformTheme::MenuBarFont:
case QPlatformTheme::MenuItemFont:
return kCTFontMenuItemFontType;
return kCTFontUIFontMenuItem;
case QPlatformTheme::MessageBoxFont:
return kCTFontEmphasizedSystemFontType;
return kCTFontUIFontEmphasizedSystem;
case QPlatformTheme::LabelFont:
return kCTFontSystemFontType;
return kCTFontUIFontSystem;
case QPlatformTheme::TipLabelFont:
return kCTFontToolTipFontType;
case QPlatformTheme::StatusBarFont:
return kCTFontSystemFontType;
return kCTFontUIFontSystem;
case QPlatformTheme::TitleBarFont:
return kCTFontWindowTitleFontType;
return kCTFontUIFontWindowTitle;
case QPlatformTheme::MdiSubWindowTitleFont:
case QPlatformTheme::DockWidgetTitleFont:
return kCTFontSystemFontType;
return kCTFontUIFontSystem;
case QPlatformTheme::PushButtonFont:
return kCTFontPushButtonFontType;
return kCTFontUIFontPushButton;
case QPlatformTheme::CheckBoxFont:
case QPlatformTheme::RadioButtonFont:
return kCTFontSystemFontType;
return kCTFontUIFontSystem;
case QPlatformTheme::ToolButtonFont:
return kCTFontSmallToolbarFontType;
return kCTFontUIFontSmallToolbar;
case QPlatformTheme::ItemViewFont:
return kCTFontSystemFontType;
return kCTFontUIFontSystem;
case QPlatformTheme::ListViewFont:
return kCTFontViewsFontType;
return kCTFontUIFontViews;
case QPlatformTheme::HeaderViewFont:
return kCTFontSmallSystemFontType;
return kCTFontUIFontSmallSystem;
case QPlatformTheme::ListBoxFont:
return kCTFontViewsFontType;
return kCTFontUIFontViews;
case QPlatformTheme::ComboMenuItemFont:
return kCTFontSystemFontType;
return kCTFontUIFontSystem;
case QPlatformTheme::ComboLineEditFont:
return kCTFontViewsFontType;
return kCTFontUIFontViews;
case QPlatformTheme::SmallFont:
return kCTFontSmallSystemFontType;
return kCTFontUIFontSmallSystem;
case QPlatformTheme::MiniFont:
return kCTFontMiniSystemFontType;
return kCTFontUIFontMiniSystem;
case QPlatformTheme::FixedFont:
return kCTFontUserFixedPitchFontType;
return kCTFontUIFontUserFixedPitch;
default:
return kCTFontSystemFontType;
return kCTFontUIFontSystem;
}
}
@ -858,7 +858,7 @@ QFont *QCoreTextFontDatabase::themeFont(QPlatformTheme::Font f) const
QFont QCoreTextFontDatabase::defaultFont() const
{
if (defaultFontName.isEmpty()) {
QCFType<CTFontRef> font = CTFontCreateUIFontForLanguage(kCTFontSystemFontType, 12.0, NULL);
QCFType<CTFontRef> font = CTFontCreateUIFontForLanguage(kCTFontUIFontSystem, 12.0, NULL);
defaultFontName = (QString) QCFString(CTFontCopyFullName(font));
}