diff --git a/CHANGELOG.md b/CHANGELOG.md index eedbd3212..bdd9aa7d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -65,6 +65,7 @@ Many bugs have been fixed, and numerous features that were only partially implem * Overhaul of the screensaver (the game info overlay now works correctly for instance) * Added support for jumping to the start and end of gamelists and menus using the controller trigger buttons (or equivalent keyboard mappings) * Many additional quality of life improvements and removal of GUI inconsistencies +* Replaced the main application font with Fontfabric Akrobat * Replaced the on and off button icons with new graphics * Replaced the checked checkmark icon with new graphics * Made ScrollableContainer (used for the gamelist game descriptions) fade in as the text position is reset diff --git a/CREDITS.md b/CREDITS.md index de607da2f..989f5e84b 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -56,6 +56,9 @@ http://www.libsdl.org # Resources +Akrobat font \ +https://www.fontfabric.com/fonts/akrobat + DejaVu font \ https://dejavu-fonts.github.io @@ -65,15 +68,12 @@ https://android.googlesource.com/platform/frameworks/base Font Awesome \ https://fontawesome.com -GNU FreeFont \ +GNU FreeFont (FreeMono) \ https://www.gnu.org/software/freefont Nanum font \ https://hangeul.naver.com -Open Sans font \ -https://fonts.google.com/specimen/Open+Sans - MAME ROM information \ https://www.mamedev.org diff --git a/es-core/src/resources/Font.cpp b/es-core/src/resources/Font.cpp index 838478661..20d90e767 100644 --- a/es-core/src/resources/Font.cpp +++ b/es-core/src/resources/Font.cpp @@ -219,24 +219,22 @@ std::vector getFallbackFontPaths() // Standard fonts, let's include them here for exception handling purposes even though that's // not really the correct location. (The application will crash if they are missing.) - ResourceManager::getInstance()-> - getResourcePath(":/fonts/opensans_hebrew_condensed_light.ttf"); - ResourceManager::getInstance()-> - getResourcePath(":/fonts/opensans_hebrew_condensed_regular.ttf"); + ResourceManager::getInstance()->getResourcePath(":/fonts/Akrobat-Regular.ttf"); + ResourceManager::getInstance()->getResourcePath(":/fonts/Akrobat-SemiBold.ttf"); - // Vera sans Unicode: + // Vera sans Unicode. fontPaths.push_back(ResourceManager::getInstance()-> getResourcePath(":/fonts/DejaVuSans.ttf")); - // Freefont monospaced: + // GNU FreeFont monospaced. fontPaths.push_back(ResourceManager::getInstance()-> getResourcePath(":/fonts/FreeMono.ttf")); - // Various languages, such as Japanese and Chinese: + // Various languages, such as Japanese and Chinese. fontPaths.push_back(ResourceManager::getInstance()-> getResourcePath(":/fonts/DroidSansFallbackFull.ttf")); - // Korean: + // Korean. fontPaths.push_back(ResourceManager::getInstance()-> getResourcePath(":/fonts/NanumMyeongjo.ttf")); - // Font Awesome icon glyphs, used for star-flagging favorites in the gamelists: + // Font Awesome icon glyphs, used for star-flagging favorites in the gamelists. fontPaths.push_back(ResourceManager::getInstance()-> getResourcePath(":/fonts/fontawesome-webfont.ttf")); diff --git a/es-core/src/resources/Font.h b/es-core/src/resources/Font.h index fb39ee3c2..571c90f48 100644 --- a/es-core/src/resources/Font.h +++ b/es-core/src/resources/Font.h @@ -31,8 +31,8 @@ class TextCache; #define FONT_SIZE_LARGE (static_cast(0.085f * \ std::min(Renderer::getScreenHeight(), Renderer::getScreenWidth()))) -#define FONT_PATH_LIGHT ":/fonts/opensans_hebrew_condensed_light.ttf" -#define FONT_PATH_REGULAR ":/fonts/opensans_hebrew_condensed_regular.ttf" +#define FONT_PATH_LIGHT ":/fonts/Akrobat-Regular.ttf" +#define FONT_PATH_REGULAR ":/fonts/Akrobat-SemiBold.ttf" enum Alignment { ALIGN_LEFT, diff --git a/licenses/Akrobat_Fontfabric.pdf b/licenses/Akrobat_Fontfabric.pdf new file mode 100644 index 000000000..b1d830f7c Binary files /dev/null and b/licenses/Akrobat_Fontfabric.pdf differ diff --git a/resources/fonts/Akrobat-Regular.ttf b/resources/fonts/Akrobat-Regular.ttf new file mode 100644 index 000000000..35c223633 Binary files /dev/null and b/resources/fonts/Akrobat-Regular.ttf differ diff --git a/resources/fonts/Akrobat-SemiBold.ttf b/resources/fonts/Akrobat-SemiBold.ttf new file mode 100644 index 000000000..6954b6043 Binary files /dev/null and b/resources/fonts/Akrobat-SemiBold.ttf differ diff --git a/resources/fonts/opensans_hebrew_condensed_light.ttf b/resources/fonts/opensans_hebrew_condensed_light.ttf deleted file mode 100644 index b0b5cf6b3..000000000 Binary files a/resources/fonts/opensans_hebrew_condensed_light.ttf and /dev/null differ diff --git a/resources/fonts/opensans_hebrew_condensed_regular.ttf b/resources/fonts/opensans_hebrew_condensed_regular.ttf deleted file mode 100644 index 987276916..000000000 Binary files a/resources/fonts/opensans_hebrew_condensed_regular.ttf and /dev/null differ