diff options
author | Robin Gareus <robin@gareus.org> | 2019-12-04 19:01:44 +0100 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2019-12-04 19:01:44 +0100 |
commit | a46bbabdaf98d98539da78851e3e820d81a65b87 (patch) | |
tree | 60aed9f4dcd71a97998c8a4b8ba8fbc6f0b6fd55 /gtk2_ardour/bundle_env_linux.cc | |
parent | 72bfc67027f952b9e084390cc3f8577933d9dab3 (diff) |
Load and register ArdourSans font at application start
Diffstat (limited to 'gtk2_ardour/bundle_env_linux.cc')
-rw-r--r-- | gtk2_ardour/bundle_env_linux.cc | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/gtk2_ardour/bundle_env_linux.cc b/gtk2_ardour/bundle_env_linux.cc index 0e254a1ebf..387a9aaae8 100644 --- a/gtk2_ardour/bundle_env_linux.cc +++ b/gtk2_ardour/bundle_env_linux.cc @@ -122,22 +122,29 @@ fixup_bundle_environment (int /*argc*/, char* argv[], string & localedir) void load_custom_fonts() { - std::string ardour_mono_file; + FcConfig* config = FcInitLoadConfigAndFonts(); - if (!find_file (ardour_data_search_path(), "ArdourMono.ttf", ardour_mono_file)) { + std::string font_file; + + if (!find_file (ardour_data_search_path(), "ArdourMono.ttf", font_file)) { cerr << _("Cannot find ArdourMono TrueType font") << endl; + } else { + FcBool ret = FcConfigAppFontAddFile(config, reinterpret_cast<const FcChar8*>(font_file.c_str())); + if (ret == FcFalse) { + cerr << _("Cannot load ArdourMono TrueType font.") << endl; + } } - FcConfig *config = FcInitLoadConfigAndFonts(); - FcBool ret = FcConfigAppFontAddFile(config, reinterpret_cast<const FcChar8*>(ardour_mono_file.c_str())); - - if (ret == FcFalse) { - cerr << _("Cannot load ArdourMono TrueType font.") << endl; + if (!find_file (ardour_data_search_path(), "ArdourSans.ttf", font_file)) { + cerr << _("Cannot find ArdourSans TrueType font") << endl; + } else { + FcBool ret = FcConfigAppFontAddFile(config, reinterpret_cast<const FcChar8*>(font_file.c_str())); + if (ret == FcFalse) { + cerr << _("Cannot load ArdourSans TrueType font.") << endl; + } } - ret = FcConfigSetCurrent(config); - - if (ret == FcFalse) { + if (FcFalse == FcConfigSetCurrent(config)) { cerr << _("Failed to set fontconfig configuration.") << endl; } } |