Add Inter font, map Chicago system symbol reservations using it, use Command symbol on macOS

This commit is contained in:
elasota
2021-08-01 22:24:41 -04:00
parent f9109850a6
commit c04aeeb962
26 changed files with 389 additions and 101 deletions

View File

@@ -233,11 +233,12 @@ void DoAboutOpenSource(void)
static const int kOpenSansLicenseButton = 8;
static const int kRobotoMonoLicenseButton = 10;
static const int kGochiHandLicenseButton = 12;
static const int kLibIConvLicenseButton = 14;
static const int kRapidJSONLicenseButton = 16;
static const int kZLibLicenseButton = 18;
static const int kFreeTypeLicenseButton = 20;
static const int kSDLLicenseButton = 22;
static const int kInterLicenseButton = 14;
static const int kLibIConvLicenseButton = 16;
static const int kRapidJSONLicenseButton = 18;
static const int kZLibLicenseButton = 20;
static const int kFreeTypeLicenseButton = 22;
static const int kSDLLicenseButton = 24;
static const int kLicenseResourceApache = 1000;
static const int kLicenseResourceGPLv2 = 1001;
@@ -249,7 +250,7 @@ void DoAboutOpenSource(void)
static const int kAboutOpenSourceDialogTemplateID = 2005;
const Rect windowRect = Rect::Create(0, 0, 324, 512);
const Rect windowRect = Rect::Create(0, 0, 348, 512);
PortabilityLayer::WindowDef wdef = PortabilityLayer::WindowDef::Create(windowRect, PortabilityLayer::WindowStyleFlags::kAlert, true, 0, 0, PSTR(""));
@@ -281,6 +282,7 @@ void DoAboutOpenSource(void)
DoLicenseReader(kLicenseResourceApache);
break;
case kGochiHandLicenseButton:
case kInterLicenseButton:
DoLicenseReader(kLicenseResourceOFL);
break;
case kLibIConvLicenseButton:

View File

@@ -537,9 +537,6 @@ int AppStartup()
ToolBoxInit();
CheckOurEnvirons();
if (thisMac.isTouchscreen)
PortabilityLayer::MenuManager::GetInstance()->SetMenuTouchScreenStyle(true);
if (!thisMac.hasColor)
RedAlert(kErrNeedColorQD);
if (!thisMac.hasSystem7)
@@ -686,4 +683,4 @@ int gpAppMain()
HandleEvent();
return AppShutdown();
}
}