asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed source font to Mononoki.

Browse source
This commit is contained in:
Daniel J. Ramirez 2017-09-13 19:56:02 -05:00
parent 375378b4e8
commit b17c801ee8
6 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
COPYRIGHT.txt
View file

@ -150,9 +150,9 @@ Comment: Noto Sans font
Copyright: 2012, Google Inc. Copyright: 2012, Google Inc.
License: OFL-1.1 License: OFL-1.1
Files: ./thirdparty/fonts/source_code_pro.otf Files: ./thirdparty/fonts/mononoki_Regular.ttf
Comment: Source Code Pro font Comment: Mononoki font
Copyright: 2010, 2012, Adobe Systems Incorporated Copyright: 2013, Matthias Tellen
License: OFL-1.1 License: OFL-1.1
Files: ./thirdparty/freetype/ Files: ./thirdparty/freetype/

10
editor/editor_fonts.cpp
View file

@ -78,8 +78,8 @@ static Ref<BitmapFont> make_font(int p_height, int p_ascent, int p_valign, int p
m_name.instance(); \ m_name.instance(); \
m_name->set_size(m_size); \ m_name->set_size(m_size); \
m_name->set_font_data(DefaultFont); \ m_name->set_font_data(DefaultFont); \
m_name->set_spacing(DynamicFont::SPACING_TOP, -1); \ m_name->set_spacing(DynamicFont::SPACING_TOP, -EDSCALE); \
m_name->set_spacing(DynamicFont::SPACING_BOTTOM, -1); \ m_name->set_spacing(DynamicFont::SPACING_BOTTOM, -EDSCALE); \
MAKE_FALLBACKS(m_name); MAKE_FALLBACKS(m_name);
void editor_register_fonts(Ref<Theme> p_theme) { void editor_register_fonts(Ref<Theme> p_theme) {
@ -119,7 +119,7 @@ void editor_register_fonts(Ref<Theme> p_theme) {
Ref<DynamicFontData> dfmono; Ref<DynamicFontData> dfmono;
dfmono.instance(); dfmono.instance();
dfmono->set_font_ptr(_font_source_code_pro, _font_source_code_pro_size); dfmono->set_font_ptr(_font_mononoki_Regular, _font_mononoki_Regular_size);
//dfd->set_force_autohinter(true); //just looks better..i think? //dfd->set_force_autohinter(true); //just looks better..i think?
MAKE_DEFAULT_FONT(df, int(EditorSettings::get_singleton()->get("interface/font_size")) * EDSCALE); MAKE_DEFAULT_FONT(df, int(EditorSettings::get_singleton()->get("interface/font_size")) * EDSCALE);
@ -147,7 +147,9 @@ void editor_register_fonts(Ref<Theme> p_theme) {
Ref<DynamicFont> df_doc_code; Ref<DynamicFont> df_doc_code;
df_doc_code.instance(); df_doc_code.instance();
df_doc_code->set_size(int(EDITOR_DEF("text_editor/help/help_source_font_size", 14)) * EDSCALE); df_doc_code->set_size(int(EDITOR_DEF("text_editor/help/help_source_font_size", 18)) * EDSCALE);
df_doc_code->set_spacing(DynamicFont::SPACING_TOP, -EDSCALE);
df_doc_code->set_spacing(DynamicFont::SPACING_BOTTOM, -EDSCALE);
df_doc_code->set_font_data(dfmono); df_doc_code->set_font_data(dfmono);
MAKE_FALLBACKS(df_doc_code); MAKE_FALLBACKS(df_doc_code);

6
thirdparty/README.md vendored
View file

@ -59,10 +59,10 @@ Files extracted from upstream source:
Use UI font if exists, because it has tight vertial metrix and good for UI. Use UI font if exists, because it has tight vertial metrix and good for UI.
### Adobe Source Code Pro Regular ### Mononoki Regular
- Upstream: https://github.com/adobe-fonts/source-code-pro - Upstream: https://github.com/madmalik/mononoki
- Version: 2.030 - Version: 1.2
- License: OFL-1.1 - License: OFL-1.1
### DroidSans*.ttf ### DroidSans*.ttf

8
thirdparty/fonts/LICENSE.SourceCodePro.txt → thirdparty/fonts/LICENSE_Mononoki vendored
View file

@ -1,8 +1,9 @@
Copyright 2010, 2012 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries. Copyright (c) 2013, Matthias Tellen matthias.tellen@googlemail.com,
with Reserved Font Name monoOne.
This Font Software is licensed under the SIL Open Font License, Version 1.1. 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:
This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL http://scripts.sil.org/OFL
----------------------------------------------------------- -----------------------------------------------------------
@ -91,4 +92,3 @@ INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 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 FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE. OTHER DEALINGS IN THE FONT SOFTWARE.

BIN
thirdparty/fonts/mononoki_Regular.ttf vendored Normal file
View file

Binary file not shown.

BIN
thirdparty/fonts/source_code_pro.otf vendored
View file

Binary file not shown.