godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10896 from volzhs/fix-tree-margin

Browse Source 
Adjust Noto font metrics
This commit is contained in:
Rémi Verschelde 2017-09-04 22:58:35 +02:00 committed by GitHub
commit d84ae4ad7f
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
editor/editor_fonts.cpp
View File

@ -71,11 +71,13 @@ static Ref<BitmapFont> make_font(int p_height, int p_ascent, int p_valign, int p
m_name->add_fallback(FontJapanese); \
m_name->add_fallback(FontFallback);
#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); \
#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); \
MAKE_FALLBACKS(m_name);
void editor_register_fonts(Ref<Theme> p_theme) {

7
scene/gui/tree.cpp
View File

@ -1022,7 +1022,8 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2
cache.selected->draw(ci, r);
}
if (text_editor->is_visible()) {
text_editor->set_pos(get_global_pos() + r.pos);
Vector2 ofs(0, (text_editor->get_size().height - r.size.height) / 2);
text_editor->set_pos(get_global_pos() + r.pos - ofs);
}
}
@ -2385,8 +2386,8 @@ bool Tree::edit_selected() {
return true;
} else if (c.mode == TreeItem::CELL_MODE_STRING || c.mode == TreeItem::CELL_MODE_RANGE || c.mode == TreeItem::CELL_MODE_RANGE_EXPRESSION) {
Point2i textedpos = get_global_pos() + rect.pos;
Vector2 ofs(0, (text_editor->get_size().height - rect.size.height) / 2);
Point2i textedpos = get_global_pos() + rect.pos - ofs;
text_editor->set_pos(textedpos);
text_editor->set_size(rect.size);
text_editor->clear();