Changed source font to Mononoki.
This commit is contained in:
parent
375378b4e8
commit
b17c801ee8
6 changed files with 21 additions and 19 deletions
|
@ -150,9 +150,9 @@ Comment: Noto Sans font
|
|||
Copyright: 2012, Google Inc.
|
||||
License: OFL-1.1
|
||||
|
||||
Files: ./thirdparty/fonts/source_code_pro.otf
|
||||
Comment: Source Code Pro font
|
||||
Copyright: 2010, 2012, Adobe Systems Incorporated
|
||||
Files: ./thirdparty/fonts/mononoki_Regular.ttf
|
||||
Comment: Mononoki font
|
||||
Copyright: 2013, Matthias Tellen
|
||||
License: OFL-1.1
|
||||
|
||||
Files: ./thirdparty/freetype/
|
||||
|
|
|
@ -73,13 +73,13 @@ static Ref<BitmapFont> make_font(int p_height, int p_ascent, int p_valign, int p
|
|||
m_name->add_fallback(FontFallback);
|
||||
|
||||
// the custom spacings might only work with Noto Sans
|
||||
#define MAKE_DEFAULT_FONT(m_name, m_size) \
|
||||
Ref<DynamicFont> m_name; \
|
||||
m_name.instance(); \
|
||||
m_name->set_size(m_size); \
|
||||
m_name->set_font_data(DefaultFont); \
|
||||
m_name->set_spacing(DynamicFont::SPACING_TOP, -1); \
|
||||
m_name->set_spacing(DynamicFont::SPACING_BOTTOM, -1); \
|
||||
#define MAKE_DEFAULT_FONT(m_name, m_size) \
|
||||
Ref<DynamicFont> m_name; \
|
||||
m_name.instance(); \
|
||||
m_name->set_size(m_size); \
|
||||
m_name->set_font_data(DefaultFont); \
|
||||
m_name->set_spacing(DynamicFont::SPACING_TOP, -EDSCALE); \
|
||||
m_name->set_spacing(DynamicFont::SPACING_BOTTOM, -EDSCALE); \
|
||||
MAKE_FALLBACKS(m_name);
|
||||
|
||||
void editor_register_fonts(Ref<Theme> p_theme) {
|
||||
|
@ -119,7 +119,7 @@ void editor_register_fonts(Ref<Theme> p_theme) {
|
|||
|
||||
Ref<DynamicFontData> dfmono;
|
||||
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?
|
||||
|
||||
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;
|
||||
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);
|
||||
MAKE_FALLBACKS(df_doc_code);
|
||||
|
||||
|
|
6
thirdparty/README.md
vendored
6
thirdparty/README.md
vendored
|
@ -59,10 +59,10 @@ Files extracted from upstream source:
|
|||
|
||||
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
|
||||
- Version: 2.030
|
||||
- Upstream: https://github.com/madmalik/mononoki
|
||||
- Version: 1.2
|
||||
- License: OFL-1.1
|
||||
|
||||
### DroidSans*.ttf
|
||||
|
|
|
@ -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 license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
|
||||
This license is copied below, and is also available with a FAQ at:
|
||||
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
|
||||
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
|
||||
OTHER DEALINGS IN THE FONT SOFTWARE.
|
||||
|
BIN
thirdparty/fonts/mononoki_Regular.ttf
vendored
Normal file
BIN
thirdparty/fonts/mononoki_Regular.ttf
vendored
Normal file
Binary file not shown.
BIN
thirdparty/fonts/source_code_pro.otf
vendored
BIN
thirdparty/fonts/source_code_pro.otf
vendored
Binary file not shown.
Loading…
Reference in a new issue