diff --git a/plugins/fonts/romfs/FIRACODE_LICENSE.txt b/plugins/fonts/romfs/JETBRAINS_MONO_LICENSE.txt similarity index 96% rename from plugins/fonts/romfs/FIRACODE_LICENSE.txt rename to plugins/fonts/romfs/JETBRAINS_MONO_LICENSE.txt index 6bd9f9f2f..8bee4148c 100644 --- a/plugins/fonts/romfs/FIRACODE_LICENSE.txt +++ b/plugins/fonts/romfs/JETBRAINS_MONO_LICENSE.txt @@ -1,8 +1,8 @@ -Copyright (c) 2014, The Fira Code Project Authors (https://github.com/tonsky/FiraCode) +Copyright 2020 The JetBrains Mono Project Authors (https://github.com/JetBrains/JetBrainsMono) This Font Software is licensed under the SIL Open Font License, Version 1.1. This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL +https://scripts.sil.org/OFL ----------------------------------------------------------- @@ -18,7 +18,7 @@ with others. The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, +fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The @@ -90,4 +90,4 @@ COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. \ No newline at end of file +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/plugins/fonts/romfs/fonts/JetBrainsMono.ttf b/plugins/fonts/romfs/fonts/JetBrainsMono.ttf new file mode 100644 index 000000000..97671156d Binary files /dev/null and b/plugins/fonts/romfs/fonts/JetBrainsMono.ttf differ diff --git a/plugins/fonts/romfs/fonts/firacode.ttf b/plugins/fonts/romfs/fonts/firacode.ttf deleted file mode 100644 index 660742d61..000000000 Binary files a/plugins/fonts/romfs/fonts/firacode.ttf and /dev/null differ diff --git a/plugins/fonts/source/font_loader.cpp b/plugins/fonts/source/font_loader.cpp index 5c98cf13d..3cc99f791 100644 --- a/plugins/fonts/source/font_loader.cpp +++ b/plugins/fonts/source/font_loader.cpp @@ -322,7 +322,7 @@ namespace hex::fonts { if (pixelPerfectFont) defaultFont = fontAtlas.addDefaultFont(); else - defaultFont = fontAtlas.addFontFromRomFs("fonts/firacode.ttf", fontSize * 1.1, true, ImVec2()); + defaultFont = fontAtlas.addFontFromRomFs("fonts/JetBrainsMono.ttf", 16, true, ImVec2()); if (!fontAtlas.build()) { log::fatal("Failed to load default font!");